Skip to content

Commit 169807b

Browse files
authored
Merge branch 'main' into RHIDP-5421
2 parents 4a14c71 + def8b2b commit 169807b

File tree

49 files changed

+1023
-666
lines changed

Some content is hidden

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

49 files changed

+1023
-666
lines changed

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

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ The Keycloak backend plugin, which integrates Keycloak into {product-short}, has
66
* Synchronization of Keycloak users in a realm.
77
* Synchronization of Keycloak groups and their users in a realm.
88

9-
== For administrators
10-
11-
=== Installation
9+
== Installation
1210

1311
The Keycloak plugin is pre-loaded in {product-short} with basic configuration properties. To enable it, set the `disabled` property to `false` as follows:
1412

@@ -23,7 +21,7 @@ global:
2321
disabled: false
2422
----
2523

26-
=== Basic configuration
24+
== Basic configuration
2725
To enable the Keycloak plugin, you must set the following environment variables:
2826

2927
* `KEYCLOAK_BASE_URL`
@@ -36,7 +34,7 @@ To enable the Keycloak plugin, you must set the following environment variables:
3634

3735
* `KEYCLOAK_CLIENT_SECRET`
3836

39-
=== Advanced configuration
37+
== Advanced configuration
4038

4139
.Schedule configuration
4240
You can configure a schedule in the `app-config.yaml` file, as follows:
@@ -140,7 +138,7 @@ When using client credentials, the access type must be set to `confidential` and
140138
* `query-users`
141139
* `view-users`
142140

143-
=== Limitations
141+
== Limitations
144142

145143
If you have self-signed or corporate certificate issues, you can set the following environment variable before starting {product-short}:
146144

@@ -152,29 +150,3 @@ If you have self-signed or corporate certificate issues, you can set the followi
152150
The solution of setting the environment variable is not recommended.
153151
====
154152

155-
== For users
156-
157-
=== Import of users and groups in {product-short} using the Keycloak plugin
158-
159-
After configuring the plugin successfully, the plugin imports the users and groups each time when started.
160-
161-
[NOTE]
162-
====
163-
If you set up a schedule, users and groups will also be imported.
164-
====
165-
166-
After the first import is complete, you can select *User* to list the users from the catalog page:
167-
168-
image::rhdh-plugins-reference/users.jpg[catalog-list]
169-
170-
You can see the list of users on the page:
171-
172-
image::rhdh-plugins-reference/user-list.jpg[user-list]
173-
174-
When you select a user, you can see the information imported from Keycloak:
175-
176-
image::rhdh-plugins-reference/user2.jpg[user-profile]
177-
178-
You can also select a group, view the list, and select or view the information imported from Keycloak for a group:
179-
180-
image::rhdh-plugins-reference/group1.jpg[group-profile]

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

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,11 @@ After configuring the plugin successfully, the plugin imports the users and grou
1515
If you set up a schedule, users and groups will also be imported.
1616
====
1717

18-
After the first import is complete, you can select *User* to list the users from the catalog page:
19-
20-
image::rhdh-plugins-reference/users.jpg[catalog-list]
21-
22-
You can see the list of users on the page:
23-
24-
image::rhdh-plugins-reference/user-list.jpg[user-list]
25-
26-
When you select a user, you can see the information imported from Keycloak:
27-
28-
image::rhdh-plugins-reference/user2.jpg[user-profile]
29-
30-
You can also select a group, view the list, and select or view the information imported from Keycloak for a group:
31-
32-
image::rhdh-plugins-reference/group1.jpg[group-profile]
18+
.Procedure
19+
. in {product}, go to the *Catalog* page.
20+
. Select *User* from the entity type filter to display the list of imported users.
21+
. Browse the list of users displayed on the page.
22+
. Select a user to view detailed information imported from Keycloak.
23+
. To view groups, select *Group* from the entity type filter.
24+
. Browse the list of groups shown on the page.
25+
. From the list of groups, select a group to view the information imported from Keycloak.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ include::assembly-managing-authorizations-by-using-external-files.adoc[leveloffs
4343

4444
include::assembly-configuring-guest-access-with-rbac-ui.adoc[leveloffset=+1]
4545

46+
include::modules/authorization/proc-delegating-rbac-access.adoc[leveloffset=+1]
4647

4748
include::modules/authorization/ref-rbac-permission-policies.adoc[leveloffset=+1]
4849

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
[id="assembly-configuring-default-secret-pvc-mounts_{context}"]
3+
= Configuring default mounts for Secrets and PVCs
4+
5+
You can configure Persistent Volume Claims (PVCs) and Secrets mount in your {product} deployment. Use annotations to define the custom mount paths and specify the containers to mount them to.
6+
7+
include::modules/configuring-external-databases/proc-configuring-mount-paths.adoc[leveloffset=+1]
8+
9+
include::modules/configuring-external-databases/proc-mounting-to-specific-containers.adoc[leveloffset=+1]

assemblies/assembly-configuring-high-availability.adoc

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,19 @@
33
[id="{context}"]
44
= Configuring high availability in {product}
55

6-
Previously, {product} supports a single-instance application. With this configuration, if the instance fails due to software crashes, hardware issues, or other unexpected disruptions, the entire {product} service becomes unavailable, preventing the development workflows or access to the resources. With high availability, you receive a failover mechanism that ensures the service is available even if one or more components fail. By increasing the number of replicas, you introduce redundancy to help increase higher productivity and minimize disruption.
76

8-
As an administrator, you can configure high availability in {product}. Once you set the high availability option in {product-short}, the {ocp-brand-name} built-in Load Balancer manages the ingress traffic and distributes the load to each pod. The {product-very-short} backend also manages concurrent requests or conflicts on the same resource.
7+
High availability (HA) is a system design approach that ensures a service remains continuously accessible, even during failures of individual components, by eliminating single points of failure. It introduces redundancy and failover mechanisms to minimize downtime and maintain operational continuity.
98

10-
You can configure high availability in {product-short} by scaling your `replicas` to a number greater than 1 in your configuration file. The configuration file that you use depends on the method that you used to install your {product-short} instance. If you used the Operator to install your {product-short} instance, configure the replica values in your `{product-custom-resource-type}` custom resource. If you used the Helm chart to install your {product-short} instance, configure the replica values in your Helm chart.
9+
{product} supports HA deployments on {ocp-brand-name} and {aks-name}. The HA deployments enable more resilient and reliable service availability across supported environments.
10+
11+
In a single instance deployment, if a failure occurs, whether due to software crashes, hardware issues, or other unexpected disruptions, it would make the entire service unavailable, interrupting development workflows and access to key resources.
12+
13+
With HA enabled, you can scale the number of backend replicas to introduce redundancy. This setup ensures that if one pod or component fails, others continue to serve requests without disruption. The built-in load balancer manages ingress traffic and distributes the load across the available pods. Meanwhile, the {product-very-short} backend manages concurrent requests and resolves resource-level conflicts effectively.
14+
15+
As an administrator, you can configure high availability by adjusting replica values in your configuration file:
16+
17+
* If you installed using the Operator, configure the replica values in your `{product-custom-resource-type}` custom resource.
18+
* If you used the Helm chart, set the replica values in the Helm configuration.
1119
1220
include::modules/configuring-high-availability/proc-configuring-high-availability-in-rhdh-operator-deployment.adoc[leveloffset=+1]
1321

assemblies/assembly-configuring-the-global-header.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
As an administrator, you can configure the {product} global header to create a consistent and flexible navigation bar across your {product-short} instance.
77
By default, the {product-short} global header includes the following components:
88

9-
* *Create* button provides quick access to a variety of templates, enabling users to efficiently set up services, backend and front-end plugins within {product-short}
9+
* *Self-service* button provides quick access to a variety of templates, enabling users to efficiently set up services, backend and front-end plugins within {product-short}
1010
* *Support* button that can link an internal or external support page
1111
* *Notifications* button displays alerts and updates from plugins and external services
1212
* *Search* input field allows users to find services, components, documentation, and other resources within {product-short}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[id="assembly-logging-with-amazon-cloudwatch_{context}"]
2+
= Logging with Amazon CloudWatch
3+
4+
Logging within the {product} relies on the link:https://github.com/winstonjs/winston[Winston library].
5+
The default logging level is `info`.
6+
To have more detailed logs, set the `LOG_LEVEL` environment variable to `debug` in your {product} instance.
7+
8+
9+
include::modules/observe/proc-configuring-the-application-log-level-for-logging-with-amazon-cloudwatch-logs-by-using-the-operator.adoc[leveloffset=+1]
10+
11+
12+
include::modules/observe/proc-configuring-the-application-log-level-for-logging-with-amazon-cloudwatch-logs-by-using-the-helm-chart.adoc[leveloffset=+1]
13+
14+
15+
include::modules/observe/proc-retrieving-logs-from-amazon-cloudwatch.adoc[leveloffset=+1]
16+
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
[id="assembly-managing-labels-annotations-topology"]
3+
= Managing labels and annotations for Topology plugins
4+
:context: assembly-managing-labels-annotations-topology
5+
6+
include::modules/dynamic-plugins/proc-linking-to-source-code-editor-or-source.adoc[leveloffset=+1]
7+
8+
include::modules/dynamic-plugins/proc-entity-annotation-or-label.adoc[leveloffset=+1]
9+
10+
include::modules/dynamic-plugins/proc-namespace-annotation.adoc[leveloffset=+1]
11+
12+
include::modules/dynamic-plugins/proc-label-selector-query-annotation.adoc[leveloffset=+1]
13+
14+
include::modules/dynamic-plugins/proc-icon-displayed-in-the-node.adoc[leveloffset=+1]
15+
16+
include::modules/dynamic-plugins/proc-app-grouping.adoc[leveloffset=+1]
17+
18+
include::modules/dynamic-plugins/proc-node-connector.adoc[leveloffset=+1]
19+
20+
For more information about the labels and annotations, see _Guidelines for labels and annotations for OpenShift applications_.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[id="assembly-monitoring-and-logging-with-aws_{context}"]
2+
= Monitoring and logging {product} on {aws-brand-name} ({aws-short})
3+
4+
You can configure {product} to use Amazon CloudWatch for real-time monitoring and Amazon Prometheus for comprehensive logging.
5+
This is convenient when hosting {product-short} on {aws-brand-name} ({aws-short}) infrastructure.
6+
7+
include::assembly-monitoring-with-amazon-prometheus.adoc[leveloffset=+1]
8+
9+
10+
include::assembly-logging-with-amazon-cloudwatch.adoc[leveloffset=+1]
11+
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[id="assembly-monitoring-with-amazon-prometheus_{context}"]
2+
= Monitoring with Amazon Prometheus
3+
4+
You can configure {product} to use Amazon Prometheus for comprehensive logging.
5+
Amazon Prometheus extracts data from pods that have specific pod annotations.
6+
7+
== Prerequisites
8+
9+
* You link:https://docs.aws.amazon.com/eks/latest/userguide/prometheus.htm[configured Prometheus for your {eks-name} ({eks-short}) clusters].
10+
* You link:https://docs.aws.amazon.com/prometheus/latest/userguide/AMP-onboard-create-workspace.html[created an Amazon managed service for the Prometheus workspace].
11+
* You link:https://docs.aws.amazon.com/prometheus/latest/userguide/AMP-onboard-ingest-metrics.html[configured Prometheus to import the {product-short} metrics].
12+
* You ingested Prometheus metrics into the created workspace.
13+
14+
15+
include::modules/observe/proc-configuring-annotations-for-monitoring-with-amazon-prometheus-by-using-the-operator.adoc[leveloffset=+1]
16+
17+
18+
include::modules/observe/proc-configuring-annotations-for-monitoring-with-amazon-prometheus-by-using-the-helm-chart.adoc[leveloffset=+1]
19+
20+
21+
22+

0 commit comments

Comments
 (0)