Skip to content

Commit 9c093de

Browse files
committed
fixed review comments
1 parent edace74 commit 9c093de

File tree

4 files changed

+44
-40
lines changed

4 files changed

+44
-40
lines changed

docs/src/operations/v2.0.0/bpe/logging.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ Every logger exposes a *.style property and a corresponding environment variable
6262
Plain, unformatted text output (default for console output, used before DSF 2).
6363

6464
Use when:
65-
- You want minimal overhead and simple logging.
66-
- Logs are read directly on the system.
65+
- You want minimal overhead and simple logging
66+
- Logs are read directly on the system
6767

6868
Avoid when:
69-
- A log aggregation system is used.
69+
- A log aggregation system is used
7070

7171
#### TEXT_MDC
7272

@@ -77,26 +77,26 @@ Plain text with MDC (Mapped Diagnostic Context) fields, such as:
7777
- user
7878
- requestId
7979

80-
Recommended for:
81-
- Production file logs
82-
- Debugging distributed workflows with correlation IDs
80+
Use when:
81+
- You want to log production environments without aggregation systems
82+
- You want to debug distributed workflows with correlation IDs
8383

84-
Not ideal for:
85-
- A log aggregation system is used.
84+
Avoid when:
85+
- A log aggregation system is used
8686

8787
#### TEXT_COLOR and TEXT_COLOR_MDC
8888

8989
ANSI-colored text output for terminals.
9090

91-
Recommended for:
92-
- Local development
93-
- Docker logs viewed directly with docker logs
94-
- Developers who want fast visual distinction between INFO/WARN/ERROR
91+
Use when:
92+
- You want to develop locally
93+
- You want to view docker logs directly with `docker logs` command
94+
- You want a fast visual distinction between INFO/WARN/ERROR
9595

96-
Avoid for:
97-
- Log ingestion systems
98-
- Consoles without ANSI escape code support
96+
Avoid when:
97+
- A log aggregation system is used
98+
- Consoles without ANSI escape code support are used
9999

100100

101101
### JSON-Based Logging Styles
102-
We support the structured logging formats `JSON_LOGSTASH`, `JSON_ECS`(Elastic Common Schema), `JSON_GELF`(Graylog Extended Log Format), and `JSON_GCP` (Google Cloud Platform Logging). They all include Mapped Diagnostic Context information (e.g., process names, ids, ...) and should be used in combination with your log aggreation system of your choice.
102+
We support the structured logging formats `JSON_LOGSTASH`, `JSON_ECS`(Elastic Common Schema), `JSON_GELF`(Graylog Extended Log Format), and `JSON_GCP` (Google Cloud Platform Logging). They all include Mapped Diagnostic Context information (e.g., process names, ids, ...) and should be used in combination with the log aggreation system of your choice.

docs/src/operations/v2.0.0/fhir/access-control.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ DSF roles specified via the `dsf-role` property define general access to the RES
8181
In order to allow users to start processes, the property `practitioner-role` can be used to assign codes from FHIR [CodeSystem](http://hl7.org/fhir/R4/codesystem.html) resources. Codes are specified in the form `system-url|code`.
8282
If the uses has a code specified here that match with a `requester` extension within the process plugin's [ActivityDefinition](http://hl7.org/fhir/R4/activitydefinition.html) resource, the user can start the process if he also has the `dsf-role` `CREATE`.
8383

84-
Process plugins can defined and use there own code-systems. However, the DSF specifies a standard set of practitioner roles within the CodeSystem `http://dsf.dev/fhir/CodeSystem/practitioner-role`:
84+
Process plugins can define and use their own code-systems. However, the DSF specifies a standard set of practitioner roles within the CodeSystem `http://dsf.dev/fhir/CodeSystem/practitioner-role`:
8585

8686
`UAC_USER`, `COS_USER`, `CRR_USER`, `DIC_USER`, `DMS_USER`, `DTS_USER`, `HRP_USER`, `TTP_USER`, `AMS_USER`, `ASP_USER`, `SPR_USER`, `TSP_USER`, `PPH_USER`, `BIO_USER`, and `DSF_ADMIN`.
8787

@@ -109,17 +109,19 @@ The first example defines a group of DSF administrators. Two client certificates
109109
```
110110

111111

112-
The second example defines a group of DSF administrators by specifying an `admin` role that gets matched against OAuth 2.0 access tokens:
112+
The second example defines an administrator group consisting of all users with the OAuth role admin plus two additional administrators identified by their client-certificate thumbprints. These administrators may perform the basic DSF tasks: starting and continuing of new process instances (by creating tasks and answering QuestionnaireResponses) and reading all resources on the DSF FHIR server.
113113

114114
```yaml
115115
DEV_DSF_FHIR_SERVER_ROLECONFIG: |
116-
- token-role-admins:
116+
- example_minimal_admin:
117+
thumbprint:
118+
- 0123...cdef
119+
- abcd...6789
117120
token-role: admin
118121
dsf-role:
119-
- CREATE
122+
- CREATE: [Task]
120123
- READ
121-
- UPDATE
122-
- DELETE
124+
- UPDATE: [QuestionnaireResponse]
123125
- SEARCH
124126
- HISTORY
125127
practitioner-role:

docs/src/operations/v2.0.0/fhir/logging.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ Every logger exposes a *.style property and a corresponding environment variable
5050
Plain, unformatted text output (default for console output, used before DSF 2).
5151

5252
Use when:
53-
- You want minimal overhead and simple logging.
54-
- Logs are read directly on the system.
53+
- You want minimal overhead and simple logging
54+
- Logs are read directly on the system
5555

5656
Avoid when:
57-
- A log aggregation system is used.
57+
- A log aggregation system is used
5858

5959
#### TEXT_MDC
6060

@@ -65,26 +65,26 @@ Plain text with MDC (Mapped Diagnostic Context) fields, such as:
6565
- user
6666
- requestId
6767

68-
Recommended for:
69-
- Production file logs
70-
- Debugging distributed workflows with correlation IDs
68+
Use when:
69+
- You want to log production environments without aggregation systems
70+
- You want to debug distributed workflows with correlation IDs
7171

72-
Not ideal for:
73-
- A log aggregation system is used.
72+
Avoid when:
73+
- A log aggregation system is used
7474

7575
#### TEXT_COLOR and TEXT_COLOR_MDC
7676

7777
ANSI-colored text output for terminals.
7878

79-
Recommended for:
80-
- Local development
81-
- Docker logs viewed directly with docker logs
82-
- Developers who want fast visual distinction between INFO/WARN/ERROR
79+
Use when:
80+
- You want to develop locally
81+
- You want to view docker logs directly with `docker logs` command
82+
- You want a fast visual distinction between INFO/WARN/ERROR
8383

84-
Avoid for:
85-
- Log ingestion systems
86-
- Consoles without ANSI escape code support
84+
Avoid when:
85+
- A log aggregation system is used
86+
- Consoles without ANSI escape code support are used
8787

8888

8989
### JSON-Based Logging Styles
90-
We support the structured logging formats `JSON_LOGSTASH`, `JSON_ECS`(Elastic Common Schema), `JSON_GELF`(Graylog Extended Log Format), and `JSON_GCP` (Google Cloud Platform Logging). They all include Mapped Diagnostic Context information (e.g., process names, ids, ...) and should be used in combination with your log aggreation system of your choice.
90+
We support the structured logging formats `JSON_LOGSTASH`, `JSON_ECS`(Elastic Common Schema), `JSON_GELF`(Graylog Extended Log Format), and `JSON_GCP` (Google Cloud Platform Logging). They all include Mapped Diagnostic Context information (e.g., process names, ids, ...) and should be used in combination with the log aggreation system of your choice.

docs/src/operations/v2.0.0/upgrade-from-1.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,18 @@ For DSF 2, we refined the [system requirements](install.md#prerequisites). If yo
2222

2323
::: info Non-standard configuration changes
2424

25-
The most non-standard configuration changes working in DSF 1 will continue to work in DSF 2. If you have set custom timeout options please change them to the ISO 8601 standard. `120000` (Milliseconds) must be changed to `PT2M`.
25+
Most non-standard configuration changes working in DSF 1 will continue to work in DSF 2. If you have set custom timeout options please change them to the ISO 8601 standard. `120000` (Milliseconds) must be changed to `PT2M`.
2626

2727
- You can now use more advanced [logging options](./fhir/logging.md).
2828
- If you use your own certificate authority, the [configuration](root-certificates.md) will be easier.
29-
- If can now use more fine granular access control settings in your own [access control / role config settings](./fhir/access-control.md).
29+
- More granular control in [access control / role config settings](./fhir/access-control.md).
3030
:::
3131

3232
We recommend upgrading the PostgreSQL DBMS from version 15 to version 18. At present, it is possible to use PostgreSQL version 15, but we exclusively support PostgreSQL version 18 and test the DSF solely with version 18.
3333
The DBMS upgrade is described below in the update instructions.
3434

35+
DSF 2 was designed to run DSF 1 (APIv1) process plugins, but due to stricter validation rules in DSF 2 we strongly recommend using the latest compatible plugin versions. Updates within the same major and minor version (e.g., from 1.2.3.4 to 1.2.9.9) are generally safe. An overview of the recommended MII/NUM versions can be found [here](./install-plugins.md).
36+
3537
## Modify DSF FHIR Server Setup
3638
1. Preparation / Backup
3739
* We recommend to create a backup of the `/opt/fhir` directory before proceeding with the upgrade.

0 commit comments

Comments
 (0)