Skip to content

Commit ce6e76c

Browse files
authored
Merge branch 'main' into RHIDP-7849
2 parents 87c5eae + 6bc4256 commit ce6e76c

23 files changed

+582
-271
lines changed

assemblies/assembly-configuring-techdocs.adoc

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
:_mod-docs-content-type: ASSEMBLY
22
:context: configuring-techdocs
33
[id="{context}"]
4-
= TechDocs configuration
4+
= Configuring TechDocs
55

66
The TechDocs plugin is preinstalled and enabled on a {product-short} instance by default. You can disable or enable the TechDocs plugin, and change other parameters, by configuring the {product} Helm chart or the {product} Operator ConfigMap.
77

@@ -19,22 +19,23 @@ After you configure {odf-name} to store the files that TechDocs generates, you c
1919

2020
* For more information, see link:{configuring-dynamic-plugins-book-url}[{configuring-dynamic-plugins-book-title}].
2121
22+
//configuring storage
2223
include::modules/customizing-techdocs/con-techdocs-configure-storage.adoc[leveloffset=+1]
2324

25+
//configuring storage - Amazon S3
26+
include::modules/techdocs/proc-techdocs-configure-amazon-s3-storage.adoc[leveloffset=+2]
27+
28+
//configuring storage - ODF
2429
include::modules/customizing-techdocs/proc-techdocs-using-odf-storage.adoc[leveloffset=+2]
2530

26-
include::modules/customizing-techdocs/proc-techdocs-configure-odf-helm.adoc[leveloffset=+2]
31+
include::modules/customizing-techdocs/proc-techdocs-configure-odf-helm.adoc[leveloffset=+3]
2732

28-
include::modules/customizing-techdocs/ref-techdocs-example-config-plugin-helm.adoc[leveloffset=+3]
33+
include::modules/customizing-techdocs/ref-techdocs-example-config-plugin-helm.adoc[leveloffset=+4]
2934

30-
include::modules/customizing-techdocs/proc-techdocs-configure-odf-operator.adoc[leveloffset=+2]
35+
include::modules/customizing-techdocs/proc-techdocs-configure-odf-operator.adoc[leveloffset=+3]
3136

32-
include::modules/customizing-techdocs/ref-techdocs-example-config-plugin-operator.adoc[leveloffset=+3]
37+
include::modules/customizing-techdocs/ref-techdocs-example-config-plugin-operator.adoc[leveloffset=+4]
3338

39+
//configuring CI/CD
3440
include::modules/customizing-techdocs/con-techdocs-config-cicd.adoc[leveloffset=+1]
3541

36-
include::modules/customizing-techdocs/proc-techdocs-config-cicd-prep-repo.adoc[leveloffset=+2]
37-
38-
include::modules/customizing-techdocs/proc-techdocs-generate-site.adoc[leveloffset=+2]
39-
40-
include::modules/customizing-techdocs/proc-techdocs-publish-site.adoc[leveloffset=+2]

assemblies/assembly-log-levels.adoc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[id="assembly-log-levels_{context}"]
2+
= Log Levels
3+
4+
Logging is an essential part of monitoring and debugging software applications. It provides insight into how the application is functioning at runtime and can help you detect and diagnose issues. By adjusting the log level, you can control the amount and type of information displayed in the logs, ranging from highly detailed diagnostic output to the most critical errors. With this flexibility, you can customize logging output to match your current requirements, whether during development, testing, or production.
5+
6+
You can choose from the following log levels, listed in order of decreasing verbosity:
7+
8+
- `debug`: Detailed information, typically useful only when troubleshooting.
9+
- `info`: General information about the operation of the application. This is the default level.
10+
- `warn`: Indicates potential issues or situations that might require attention.
11+
- `error`: Indicates errors that have occurred but might not prevent the application from continuing.
12+
- `critical`: Indicates critical errors that require immediate attention and are likely to prevent the application from functioning correctly.
13+
14+
You can control the verbosity of the logging by setting the log level. The log level determines the minimum severity level of events displayed in the console. For example, if the log level is set to 'info', events with a severity level of 'debug' are ignored.
15+
16+
To increase the log level, you can set the `LOG_LEVEL` environment variable to a higher severity level, such as 'warn' or 'error'. However, increasing the log level might not result in more output if the existing code primarily emits logs at lower severity levels, for example, 'debug' or 'info'. In such a case, adjust the logging statements within the code to use higher severity levels to see more output.
17+
18+
No additional steps are required beyond setting the `LOG_LEVEL` environment variable, but its effectiveness depends on the existing logging statements in the code.

assemblies/assembly-logging-with-amazon-cloudwatch.adoc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
= Logging with Amazon CloudWatch
33

44
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-
85

96
include::modules/observe/proc-configuring-the-application-log-level-for-logging-with-amazon-cloudwatch-logs-by-using-the-operator.adoc[leveloffset=+1]
107

assemblies/assembly-using-techdocs.adoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,9 @@ include::modules/techdocs/proc-techdocs-find-docs.adoc[leveloffset=+1]
1212
include::modules/techdocs/proc-techdocs-view-docs.adoc[leveloffset=+1]
1313

1414
include::modules/techdocs/proc-techdocs-edit-docs.adoc[leveloffset=+1]
15+
16+
//embedding videos
17+
include::modules/techdocs/proc-techdocs-embed-videos.adoc[leveloffset=+1]
18+
19+
//generating pipelines with GitHub Actions
20+
include::modules/techdocs/proc-techdocs-pipeline-github-actions.adoc[leveloffset=+1]

modules/configuring-high-availability/proc-configuring-high-availability-in-rhdh-operator-deployment.adoc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ kind: Backstage
1616
metadata:
1717
name: _<your_yaml_file>_
1818
spec:
19-
application:
20-
...
21-
replicas: _<replicas_value>_ <1>
22-
...
19+
deployment:
20+
patch:
21+
spec:
22+
...
23+
replicas: _<replicas_value>_ <1>
24+
...
2325
----
2426
====
2527
<1> Set the number of replicas based on the number of backup instances that you want to configure.

modules/configuring/proc-using-the-operator-to-run-rhdh-with-your-custom-configuration.adoc

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,9 @@ spec:
3131
- name: {my-app-config-config-map}
3232
extraEnvs:
3333
secrets:
34-
- name: `_<my_product_secrets>_`
34+
- name: _<my_product_secrets>_
3535
extraFiles:
3636
mountPath: /opt/app-root/src
37-
replicas: 1
3837
route:
3938
enabled: true
4039
database:
@@ -60,14 +59,13 @@ spec:
6059
dynamicPluginsConfigMapName: dynamic-plugins-rhdh
6160
extraEnvs:
6261
secrets:
63-
- name: `_<my_product_secrets>_`
62+
- name: _<my_product_secrets>_
6463
- name: {my-product-database-secrets}
6564
extraFiles:
6665
mountPath: /opt/app-root/src
6766
secrets:
6867
- name: {my-product-database-certificates-secrets}
6968
key: postgres-crt.pem, postgres-ca.pem, postgres-key.key
70-
replicas: 1
7169
route:
7270
enabled: true
7371
database:
@@ -144,7 +142,7 @@ spec:
144142
application:
145143
extraEnvs:
146144
secrets:
147-
- name: `_<my_product_secrets>_`
145+
- name: _<my_product_secrets>_
148146
----
149147
====
150148
+
@@ -156,7 +154,7 @@ spec:
156154
application:
157155
extraEnvs:
158156
secrets:
159-
- name: `_<my_product_secrets>_`
157+
- name: _<my_product_secrets>_
160158
- name: {my-product-database-secrets}
161159
----
162160
====

modules/customizing-techdocs/con-techdocs-config-cicd.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ARCHIVED
2+
13
:_mod-docs-content-type: CONCEPT
24
[id="con-techdocs-config-cicd_{context}"]
35
= Configuring CI/CD to generate and publish TechDocs sites

modules/customizing-techdocs/con-techdocs-configure-storage.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
[id="con-techdocs-configure-storage_{context}"]
33
= Configuring storage for TechDocs files
44

5-
The TechDocs publisher stores generated files in local storage or in cloud storage, such as {odf-name}, Google GCS, AWS S3, or Azure Blob Storage.
5+
The TechDocs publisher stores generated files in local storage or in cloud storage, such as AWS S3 or {odf-name}.

modules/customizing-techdocs/proc-techdocs-config-cicd-prep-repo.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ARCHIVED
2+
13
:_mod-docs-content-type: PROCEDURE
24
[id="proc-techdocs-config-cicd-prep-repo_{context}"]
35
= Preparing your repository for CI

modules/customizing-techdocs/proc-techdocs-configure-odf-operator.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ These variables are then used in the TechDocs plugin configuration.
2525
+
2626
[source,yaml]
2727
----
28-
apiVersion: objectbucket.io/v1alpha1
28+
apiVersion: rhdh.redhat.com/v1alpha3
2929
kind: Backstage
3030
metadata:
3131
name: <name>

0 commit comments

Comments
 (0)