Skip to content

Commit 2b6b42a

Browse files
authored
Merge pull request #1346 from ds-crehm/main
chore(documentation): Update and fix documentation
2 parents efba57b + 7c20d98 commit 2b6b42a

File tree

62 files changed

+297
-332
lines changed

Some content is hidden

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

62 files changed

+297
-332
lines changed

docs/src/docs/administration/backend-configuration.adoc

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,12 @@ The OAuth2, Vault configuration / secrets depend on your setup and might need to
1111
1212
== Helm configuration Trace-X backend (values.yaml)
1313
14-
[source,yaml]
15-
----
16-
include::../../../../charts/traceability-foss/values.yaml[lines=121..-1]
17-
----
14+
https://github.com/eclipse-tractusx/traceability-foss/blob/main/charts/traceability-foss/values.yaml
1815
1916
=== Values explained
2017
2118
==== <springprofile>
22-
The different profiles for the different supported environments to bootstrap the resources which are required for the respective environment.
19+
The profiles for the different supported environments to bootstrap the resources which are required for the respective environment.
2320
2421
|===
2522
|Springprofile | Description
@@ -43,13 +40,13 @@ BPN (Business Partner Number) for the traceability app used to identify the part
4340
The jdbc connection string to the database. jdbc:postgresql://${url}:${port}/trace
4441
4542
==== <datasource.username>
46-
The username of the datasource e.g. "trace"
43+
The username of the datasource e.g. "trace".
4744
4845
==== <datasource.password>
4946
The password of the datasource or the path to the vault which contains the secret. <path:../data/int/database#tracePassword>
5047
5148
==== <oauth2.clientId>
52-
Client ID for OAuth2 (KeyCloak). Request this from your Keycloak operator.
49+
Client ID for OAuth2 (Keycloak). Request this from your Keycloak operator.
5350
5451
==== <oauth2.clientSecret>
5552
Client secret for OAuth2. Request this from your OAuth2 operator.
@@ -64,10 +61,10 @@ The URL of the Keycloak JWK Set. Used by Trace-X to validate tokens when Trace-X
6461
The client which is used to authenticate the backend.
6562
6663
==== <edc.apiKey>
67-
The EDC api key or the path to the secret inside a vault. e.g. <path:../data/int/edc/controlplane#edc.api.control.auth.apikey.value>
64+
The EDC api key or the path to the secret inside a vault. E.g. <path:../data/int/edc/controlplane#edc.api.control.auth.apikey.value>
6865
6966
=== <postgresql.enabled>
70-
Enables <true> or disables <false> PostgresSQL database.
67+
Enables <true> or disables <false> the PostgresSQL database.
7168
7269
=== <postgresql.auth.postgresPassword>
7370
Database password for the *postgres* user or the path to the secret inside a vault. <path:.../data/int/database#password>
@@ -76,25 +73,22 @@ Database password for the *postgres* user or the path to the secret inside a vau
7673
Database password for the application user of the path to the secret inside a vault. <path:.../data/int/database#password>
7774
7875
=== <postgresql.auth.database>
79-
The name of the database instance.
76+
The name of the database instance.
8077
8178
=== <postgresql.auth.username>
8279
The user for the database instance.
8380
8481
=== <global.enablePrometheus>
85-
Enables <true> or disables <false> the prometheus instance.
82+
Enables <true> or disables <false> the Prometheus instance.
8683
8784
=== <global.enableGrafana>
88-
Enables <true> or disables <false> the grafana instance used for resource and application monitoring.
85+
Enables <true> or disables <false> the Grafana instance used for resource and application monitoring.
8986
9087
=== <irs-helm.enabled>
91-
Enables <true> or disables <false> irs helm charts.
88+
Enables <true> or disables <false> IRS helm charts.
9289
9390
=== <pgadmin4.enabled>
94-
Enables <true> or disables <false> pgadmin4 console for the PostgreSQL database instance
91+
Enables <true> or disables <false> pgAdmin 4 console for the PostgreSQL database instance.
9592
9693
=== <pgadmin4.ingress.enabled>
97-
Enables <true> or disables <false> a K8S Ingress for the pgadmin4 console
98-
99-
100-
94+
Enables <true> or disables <false> a K8S Ingress for the pgAdmin 4 console.

docs/src/docs/administration/configuration.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@
55
include::frontend-configuration.adoc[leveloffset=+1]
66
include::backend-configuration.adoc[leveloffset=+1]
77
include::portal-configuration.adoc[leveloffset=+1]
8-
9-

docs/src/docs/administration/frontend-configuration.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
:icons: font
55
:icon-set: fas
66
7-
87
Take the following template and adjust the configuration parameters (<placeholders> mark the relevant spots).
98
You can define the URLs as well as most of the secrets yourself.
109
1110
The OAuth2, Vault configuration / secrets depend on your setup and might need to be provided externally.
1211
1312
== Helm configuration Trace-X frontend (values.yaml)
1413
15-
values.yaml https://github.com/eclipse-tractusx/traceability-foss/blob/main/charts/traceability-foss/values.yaml
14+
https://github.com/eclipse-tractusx/traceability-foss/blob/main/charts/traceability-foss/values.yaml
1615
1716
=== Values explained
1817
@@ -29,7 +28,7 @@ Annotation for the ingress. E.g. `cert-manager.io/cluster-issuer: letsencrypt-pr
2928
The hostname of the app.
3029
3130
==== <ingress.tls>
32-
The tls settings of the app.
31+
The TLS settings of the app.
3332
3433
==== <livenessProbe>
3534
Following Tractus-X Helm Best Practices https://eclipse-tractusx.github.io/docs/release/

docs/src/docs/administration/installation.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ $ helm install -f your-values.yaml traceability-foss traceability-foss/traceabil
2424

2525
== Dependent values
2626

27-
Following values needs to match in order for application to start and have valid PostgreSQL connection:
27+
Following values need to match in order for application to start and have a valid PostgreSQL connection:
2828

2929
[source,yaml]
3030
datasource:

docs/src/docs/administration/portal-configuration.adoc

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,69 +6,69 @@
66
77
The following process is required to successfully connect to the portal:
88
9-
- Company registration with BPN, Company Name
9+
- Company registration with BPN and company name
1010
11-
- User Registration with E-Mail
11+
- User registration with e-mail
1212
1313
- Get e-mail to reset your password
1414
1515
- Reset the password and log in
1616
17-
- Make sure your user has the role App Management
17+
- Make sure your user has the role 'App Management'
1818
19-
- Navigate to App Overview
19+
- Navigate to 'App Overview'
2020
2121
- Create app
2222
2323
- Choose a selection of managed roles which is necessary (currently: BPDM, Dataspace Discovery, Semantic Model Management, Identity Wallet Management)
2424
25-
- Wait for app approval by portal
25+
- Wait for app approval by the portal team
2626
2727
- Subscribe to the app
2828
29-
- As app creator navigate to subscription management - click on configure
29+
- As app creator navigate to subscription management and click on configure
3030
31-
- Add the frontend url of the application and click approve
31+
- Add the frontend url of the application and click approve
3232
33-
- Save technical user and secret
33+
- Save technical user and secret
3434
35-
- Navigate to Register Connector
35+
- Navigate to 'Register Connector'
3636
37-
- Add managed connector
37+
- Add managed connector
3838
39-
- Select existing technical user (from app subscription)
39+
- Select existing technical user (from app subscription)
4040
41-
- Enter name "EDC Provider A"
41+
- Enter name "EDC Provider A"
4242
43-
- Enter base url of controlplane (EDC)
43+
- Enter base url of control plane (EDC)
4444
45-
- Confirm
45+
- Confirm
4646
47-
- Go to other company which want to participate (subscribe)
47+
- Go to other company which wants to participate (subscribe)
4848
49-
- Login and navigate to app overview
49+
- Login and navigate to app overview
5050
51-
- Search for the app created
51+
- Search for the created app
5252
53-
- Subscribe to the app
53+
- Subscribe to the app
5454
55-
- Go to the app creator company
55+
- Go to the app creator company
5656
57-
- Navigate to the inbox of the portal
57+
- Navigate to the inbox of the portal
5858
59-
- Click on the nav link to give approval for the company which want to subscribe
59+
- Click on the link to give approval for the company which wants to subscribe
6060
61-
- Enter name "EDC Provider B"
61+
- Enter name "EDC Provider B"
6262
63-
- Enter base url of controlplane (EDC)
63+
- Enter base url of control plane (EDC)
6464
65-
- Make sure to popuplate the new client id, secrets and app id within trace-x for each company to let it run properly with the new portal configuration.
65+
- Make sure to populate the new client id, secrets and app id within Trace-X for each company to let it run properly with the new portal configuration.
6666
6767
== Company registration
6868
https://portal.int.demo.catena-x.net/documentation[How-to]
6969
7070
=== Additional info
71-
Each instance of trace-x reflects an own company, which is associated with one BPN.
71+
Each instance of Trace-X reflects an own company, which is associated with one BPN.
7272
7373
== User registration
7474
https://portal.int.demo.catena-x.net/documentation/[How-to]
@@ -80,19 +80,19 @@ The user registration is a self-service. Each user can have one or multiple Trac
8080
https://portal.int.demo.catena-x.net/documentation/[How-to]
8181
8282
=== Additional info
83-
A connector in the context of trace-x is a Eclipse-Dataspace-Connector. This connector needs to be configured by the public controlplane URL.
83+
A connector in the context of Trace-X is a Eclipse-Dataspace-Connector. This connector needs to be configured by the public control plane URL.
8484
8585
== App registration
8686
https://portal.int.demo.catena-x.net/documentation/[How-to]
8787
8888
=== Additional info
89-
A connector in the context of trace-x is a Eclipse-Dataspace-Connector. This connector needs to be configured by the public controlplane URL.
89+
A connector in the context of trace-x is a Eclipse-Dataspace-Connector. This connector needs to be configured by the public control plane URL.
9090
9191
== Create app subscription
9292
https://portal.int.demo.catena-x.net/documentation/[How-to]
9393
9494
=== Additional info
95-
An app subscription is necessary to be able to setup a frontend url which will be authorized through keycloak and accessible with the portal.
95+
An app subscription is necessary to be able to set up a frontend url which will be authorized through Keycloak and accessible with the portal.
9696
9797
== Activate App subscription
9898
https://portal.int.demo.catena-x.net/documentation/[How-to]

docs/src/docs/administration/system-overview.adoc

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ The deployment contains the components required to connect Trace-X to an existin
55
* Trace-X frontend
66
* Trace-X backend
77
8-
98
Optionally these components can be installed using the Trace-X backend Helm chart as well:
109

1110
* PostgreSQL for Trace-X backend
12-
* pgadmin4
11+
* pgAdmin 4
1312
* IRS
1413
* EDC consumer
1514
@@ -28,12 +27,10 @@ Currently, Trace-X API handles three roles: **'User'** and **'Supervisor'** and
2827
| Category | Action | User | Supervisor | Admin
2928
| View | View Dashboard | x | x | x
3029
| | View Parts | x | x | x
31-
| | View Other parts | x | x | x
3230
| | View Quality notifications | x | x | x
33-
| | View Administration | | | x
34-
| Edit | Edit Quality notifications | | x |
35-
31+
| | View Administration panel | | | x
3632
| Quality notification | Create | x | x |
33+
| | Edit | x | x |
3734
| | Send (Approve) | | x |
3835
| | Read | x | x | x
3936
| | Cancel | x | x |
@@ -43,9 +40,6 @@ Currently, Trace-X API handles three roles: **'User'** and **'Supervisor'** and
4340
| | Close | | x |
4441

4542
| Administration panel | Access "BPN EDC config panel" | | | x
46-
| | Access "Registry lookup Panel" | | | x
47-
| | Access "Data Import Interface" | | | x
48-
43+
| | Access "Registry lookup panel" | | | x
44+
| | Access "Data import interface" | | | x
4945
|===
50-
51-
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
= Troubleshooting
22

3-
Coming soon...
3+
Coming soon...

docs/src/docs/arc42/architecture-constraints/index.adoc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,12 @@
3333
|Trace-X needs to be Catena-X compliant and the application has to follow the CX standards as well as interact with the core services and components.
3434

3535
|Release as open source
36-
|The source code - at least partially - is made available as open source and can be found in Github Catena-X ng as well as in Eclipse Tractus-X.
36+
|The source code - at least partially - is made available as open source and can be found in GitHub Catena-X ng as well as in Eclipse Tractus-X.
3737

3838
|Technology Readiness Level (TRL) for products developed within the CX consortia
3939
|As Trace-X is a reference implementation, the Technology Readiness Level (TRL) must not be above TRL 8.
4040
|===
4141

42-
43-
4442
== Political constraints
4543

4644
|===
@@ -63,5 +61,4 @@
6361

6462
|Test coverage
6563
|More than 80% of the complete source code has to be test covered.
66-
6764
|===

docs/src/docs/arc42/building-block-view/blackbox-overall.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@ include::../../../uml-diagrams/arc42/building-block-view/whitebox_overall.puml[]
1313
|Components |Description
1414

1515
|IRS
16-
|The IRS consumes relationship information across the CX-network and builds the graph view. Within this documentation, the focus lies on the IRS.
16+
|The IRS consumes relationship information across the CX-network and builds the graph view.
1717

1818
|EDC consumer
19-
|The EDC consumer component is there to fulfill the GAIA-X and IDSA-data sovereignty principles. The EDC consumer consists out of a control plane and a data plane.
19+
|The EDC consumer component is there to fulfill the GAIA-X and IDSA-data sovereignty principles. The EDC consumer is composed of a control plane and a data plane.
2020

2121
|EDC provider
2222
|The EDC provider component connects with EDC consumer component and forms the endpoint for the actual exchange of data. It handles automatic contract negotiation and the subsequent exchange of data assets for connected applications.
2323

2424
|Submodel server
2525
|The submodel server offers endpoints for requesting the submodel aspects.
26-
2726
|===

docs/src/docs/arc42/building-block-view/level-1.adoc

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,32 @@ include::../../../uml-diagrams/arc42/building-block-view/building-block-view.pum
1313
|Components |Description
1414

1515
|*Trace-X*
16-
|*Trace-X* is a system allowing the user to review the parts/assets catalogue, start a quality investigations and receive quality alerts.
16+
|*Trace-X* is a system allowing the user to review the parts / assets catalog and send / receive quality notifications related to those parts.
1717

1818
|*Trace-X API*
19-
|The *Trace-X API* is the interface over which the data consumer is communicating.
19+
|The *Trace-X API* is the interface through which the data consumer is communicating.
2020

2121
|*AssetsController*
22-
|The *AssetsController* provides a REST interface for retrieving the parts/assets information.
22+
|The *AssetsController* provides a REST interface for retrieving asset information.
2323

2424
|*DashboardController*
25-
|The *DashboardController* provides a REST interface for retrieving overall statistics displayed on a dashboard screen.
25+
|The *DashboardController* provides a REST interface for retrieving overall statistics displayed on the dashboard screen.
2626

2727
|*RegistryController*
28-
|The *RegistryController* provides a REST interface for retrieving the data from parts registry.
28+
|The *RegistryController* provides a REST interface for retrieving data from the assets registry.
2929

3030
|*ImportController*
3131
|The *ImportController* provides a REST interface for importing assets and publishing them in the Catena-X network.
3232

3333
|*AssetRepository*
34-
|The *AssetRepository* is a component responsible for storing and getting assets from database.
34+
|The *AssetRepository* is a component responsible for storing and getting assets from the database.
3535

3636
|*BPNRepository*
3737
|The *BPNRepository* is a component which stores BPN -> company name mappings.
3838

3939
|*NotificationsRepository*
40-
|The *NotificationsRepository* is a component responsible for storing and holding status of sent/received notifications.
40+
|The *NotificationsRepository* is a component responsible for storing the status and data of sent and received notifications.
4141

4242
|*Database*
43-
|The *database* is a place for storing assets, relations as well as sent/received notifications.
44-
43+
|The *database* is a place for storing assets, relations and notifications.
4544
|===

0 commit comments

Comments
 (0)