Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

XRDDEV-2468 Akka migration to gRPC #1799

Merged
merged 155 commits into from
Oct 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
155 commits
Select commit Hold shift + click to select a range
b318249
chore: initial commit for akka to rpc migration.
ricardas-buc Aug 18, 2023
7d196e0
chore: align grpc api names
ricardas-buc Aug 18, 2023
c7c27c4
chore: align grpc api names
ricardas-buc Aug 18, 2023
b44e72f
chore: add getToken rpc endpoints
ricardas-buc Aug 18, 2023
6006df8
test: Signer protocol intTest with exceptions
justasnortal Aug 21, 2023
cffe540
test: Signer protocol intTest with exceptions
justasnortal Aug 21, 2023
6034fc6
chore: enable TLS for akka and grpc in signer tests
ricardas-buc Aug 21, 2023
f6b737a
Merge remote-tracking branch 'origin/XRDDEV-2468' into XRDDEV-2468
ricardas-buc Aug 21, 2023
6b95a61
feat: error handling interceptor on signer
justasnortal Aug 22, 2023
0321d5f
Merge remote-tracking branch 'origin/XRDDEV-2468' into XRDDEV-2468
justasnortal Aug 22, 2023
0bccf9c
feat: initial error handling on grpc client side
justasnortal Aug 22, 2023
789e633
chore: unused method deleted
justasnortal Aug 22, 2023
3c9dc22
chore: migrate signer handlers to grpc
ricardas-buc Aug 23, 2023
5b0750a
Merge remote-tracking branch 'origin/XRDDEV-2468' into XRDDEV-2468
ricardas-buc Aug 23, 2023
92dbe05
chore: add temporary way to resend messages to tokens
ricardas-buc Aug 23, 2023
4bf444a
chore: add signing through grpc
ricardas-buc Aug 23, 2023
1d43359
chore: using token worker without akka
justasnortal Aug 23, 2023
8c0d767
chore: add spring DI support. Other grpc WIP things..
ricardas-buc Aug 23, 2023
4395b63
Merge remote-tracking branch 'origin/XRDDEV-2468' into XRDDEV-2468
ricardas-buc Aug 23, 2023
34d920e
chore: migrate existing handlers to spring components
ricardas-buc Aug 24, 2023
dd91374
chore: using token worker without akka
justasnortal Aug 24, 2023
65be7e7
chore: add delete/generate-cert rpc actions
ricardas-buc Aug 24, 2023
f022afe
chore: add delete/generate-cert rpc actions
ricardas-buc Aug 24, 2023
eac4f57
chore: using token worker without akka
justasnortal Aug 24, 2023
0ac17bb
chore: refactor dto/handler naming
ricardas-buc Aug 24, 2023
8de4bce
Merge remote-tracking branch 'origin/XRDDEV-2468' into XRDDEV-2468
ricardas-buc Aug 24, 2023
e0141fe
chore: using SetOcspResponses without akka
justasnortal Aug 24, 2023
3a41507
chore: migrate remaining request handlers
ricardas-buc Aug 25, 2023
ef42e7f
chore: remove signer request handler actors
ricardas-buc Aug 25, 2023
432914f
chore: add additional signer tests
ricardas-buc Aug 25, 2023
9cc1542
chore: using token worker without akka
justasnortal Aug 28, 2023
af72532
chore: deleting unused classes
justasnortal Aug 28, 2023
b50a854
test: additional signer tests
justasnortal Aug 28, 2023
e5e6ffa
test: additional signer tests
justasnortal Aug 28, 2023
1b35af3
test: unused code deleted
justasnortal Aug 29, 2023
726ece4
chore: GetOcspResponsesResp refactored from array to map
justasnortal Aug 29, 2023
c777355
chore: remove unused methods
ricardas-buc Aug 29, 2023
877c545
chore: ModuleManagerReload job
justasnortal Aug 29, 2023
1758eb8
chore: add file based passwordstore provider
ricardas-buc Aug 31, 2023
0a8f4d4
Merge remote-tracking branch 'origin/XRDDEV-2468' into XRDDEV-2468
ricardas-buc Aug 31, 2023
b79b939
chore: add int test commons with test-ca extracted from ss tests
ricardas-buc Aug 31, 2023
8d25a42
chore: containerize signer int tests
ricardas-buc Aug 31, 2023
3a9ddee
chore: enable softhsm for signer int tests
ricardas-buc Aug 31, 2023
6d350d4
chore: ocsp scheduled jobs
justasnortal Aug 31, 2023
70f4201
chore: add additional signer tests
ricardas-buc Sep 1, 2023
5f7b0b7
Merge remote-tracking branch 'origin/XRDDEV-2468' into XRDDEV-2468
ricardas-buc Sep 1, 2023
015aecb
chore: fix for various signer tests
ricardas-buc Sep 1, 2023
0dac409
chore: improve signer test run clear mechanism
ricardas-buc Sep 4, 2023
b8ed948
chore: additional signer tests
ricardas-buc Sep 4, 2023
364f912
chore: OcspResponseManager refactored to spring bean
justasnortal Sep 4, 2023
9ab956f
Merge remote-tracking branch 'origin/XRDDEV-2468' into XRDDEV-2468
justasnortal Sep 4, 2023
32064e7
chore: remove unused actors
ricardas-buc Sep 4, 2023
47359f1
chore: UNKNOWN values for enums
justasnortal Sep 5, 2023
fdf487b
chore: guava version up
justasnortal Sep 6, 2023
e03dc64
chore: security server code updates due to changes in signer
justasnortal Sep 6, 2023
286fa03
chore: central server code updates due to changes in signer
justasnortal Sep 6, 2023
b9fd766
chore: code updates due to changes in signer
justasnortal Sep 7, 2023
bc639f7
chore: misleading handleIsCachedOcspResponse(..) renamed and minor re…
justasnortal Sep 7, 2023
fde8d91
chore: refactor module/token workers not to use akka
ricardas-buc Sep 7, 2023
20e630e
Merge remote-tracking branch 'origin/XRDDEV-2468' into XRDDEV-2468
ricardas-buc Sep 7, 2023
2ce634f
chore: checkstyle fixes
ricardas-buc Sep 7, 2023
8c960e0
chore: improve reload on hwtoken failure
ricardas-buc Sep 8, 2023
c2e8a2f
chore: Remove akka based SignerClient
ricardas-buc Sep 11, 2023
dcdcfc7
chore: wip, removing akka from BatchSigner
justasnortal Sep 12, 2023
6240ec1
chore: wip, removing akka from BatchSigner
justasnortal Sep 12, 2023
b1ef627
chore: wip, removing akka from BatchSigner
justasnortal Sep 12, 2023
b2627d5
chore: wip, removing akka from BatchSigner
justasnortal Sep 12, 2023
3b10eb1
chore: improve null safety in proto dtos
ricardas-buc Sep 12, 2023
ef348de
Merge remote-tracking branch 'origin/XRDDEV-2468' into XRDDEV-2468
ricardas-buc Sep 12, 2023
1a9fada
chore: improve null safety in proto dtos
ricardas-buc Sep 12, 2023
154dae7
chore: camelCase to snake_case
justasnortal Sep 12, 2023
f5641e5
chore: proto files reorganized based on Style Guide
justasnortal Sep 12, 2023
cb28c82
chore: add proxy batch sign integration tests
ricardas-buc Sep 12, 2023
654652e
Merge remote-tracking branch 'origin/XRDDEV-2468' into XRDDEV-2468
ricardas-buc Sep 12, 2023
863a78d
chore: minor updates
justasnortal Sep 13, 2023
afab966
chore: various akka removal improvements
ricardas-buc Sep 13, 2023
8db58ca
Merge remote-tracking branch 'origin/XRDDEV-2468' into XRDDEV-2468
ricardas-buc Sep 13, 2023
826efa6
chore: improve signer startup/shutdown
ricardas-buc Sep 13, 2023
4172ae5
chore: checkstyle fixes
ricardas-buc Sep 13, 2023
2190898
chore: add rpc server host configuration
ricardas-buc Sep 13, 2023
877e7ba
chore: signer grpc client timeout
justasnortal Sep 13, 2023
0a5ede8
Merge remote-tracking branch 'origin/XRDDEV-2468' into XRDDEV-2468
justasnortal Sep 13, 2023
ba17656
chore: signer grpc client timeout
justasnortal Sep 13, 2023
200c65b
chore: fix proxy intTest
justasnortal Sep 13, 2023
bc00690
Merge branch 'develop' into XRDDEV-2468
ricardas-buc Sep 13, 2023
b880a5c
chore: add rpc server host configuration
ricardas-buc Sep 13, 2023
125648e
chore: license
justasnortal Sep 14, 2023
23cfb01
chore: build and checkstyle fixes
justasnortal Sep 14, 2023
4fcb3ba
chore: improve signer int tests
ricardas-buc Sep 14, 2023
2eb5734
Merge remote-tracking branch 'origin/XRDDEV-2468' into XRDDEV-2468
ricardas-buc Sep 14, 2023
7d596e7
chore: fix grpc todos
ricardas-buc Sep 14, 2023
82d4aeb
chore: checkstyle fixes
justasnortal Sep 15, 2023
b91c52f
chore: grpc env env variables
justasnortal Sep 15, 2023
b95fe55
chore: handling null member_id field
justasnortal Sep 18, 2023
728fd75
chore: using grpc client interceptor for timeout
justasnortal Sep 18, 2023
c4e76a8
chore: unit test fix
justasnortal Sep 18, 2023
b3d99e0
chore: enable remote debug in test signer container
justasnortal Sep 20, 2023
c4e6578
chore: minor changes in pkcs11Exception handling
justasnortal Sep 20, 2023
d83ddd3
Merge branch 'develop' into XRDDEV-2468
justasnortal Sep 20, 2023
76bab36
chore: checkstyle
justasnortal Sep 20, 2023
6d743cf
chore: minor fixes
justasnortal Sep 20, 2023
c0d6857
chore: minor fixes
justasnortal Sep 20, 2023
56748b6
chore: signer intTest file permissions fix
justasnortal Sep 21, 2023
6e67668
chore: signer, not throwing exception if second reload() after pkcs11…
justasnortal Sep 21, 2023
7105091
chore: migrate monitor/proxymonitor to grpc
ricardas-buc Sep 20, 2023
592ad4d
Merge remote-tracking branch 'origin/XRDDEV-2468' into XRDDEV-2468
ricardas-buc Sep 21, 2023
eb88683
chore: remove unused libs
ricardas-buc Sep 21, 2023
3ddbba3
chore: test fixes
ricardas-buc Sep 22, 2023
1950fb7
chore: fix missing system test logs
ricardas-buc Sep 22, 2023
b163e75
chore: fix proxui ui signer client initialization
ricardas-buc Sep 22, 2023
97dcd11
chore: fix missing grpc META-INF service locators
ricardas-buc Sep 26, 2023
79358b1
Merge branch 'develop' into XRDDEV-2468
justasnortal Sep 28, 2023
4194b40
feat: op-monitor akka removal (#1803)
ricardas-buc Sep 28, 2023
7d7e73e
chore: remove unused akka references
ricardas-buc Sep 28, 2023
9d6d7ea
Merge branch 'develop' into XRDDEV-2468
justasnortal Sep 29, 2023
9970055
Merge remote-tracking branch 'origin/develop' into XRDDEV-2468
ricardas-buc Oct 2, 2023
90791d3
chore: improve base signer testcontainer config
ricardas-buc Oct 2, 2023
bd89878
chore: enable withWaitForReady for all grpc client channels
ricardas-buc Oct 2, 2023
877581a
chore: fix ss admin service startup
ricardas-buc Oct 2, 2023
fafee7c
chore: add test case to check for signer connection recovery
ricardas-buc Oct 2, 2023
102d58a
chore: remove non relevant todos
ricardas-buc Oct 2, 2023
b0e7ec6
chore: improve proxy suite test cases
ricardas-buc Oct 3, 2023
8de79ba
Merge remote-tracking branch 'origin/develop' into XRDDEV-2468
ricardas-buc Oct 3, 2023
4d5c9eb
XRDDEV-2498 Akka removal from messagelog-addon (#1809)
justasnortal Oct 4, 2023
05a8324
chore: sonarqube fixes
ricardas-buc Oct 4, 2023
4e8f035
Merge branch 'develop' into XRDDEV-2468
ricardas-buc Oct 4, 2023
63e8075
chore: remove akka references from documentation
ricardas-buc Oct 4, 2023
6acd552
chore: add xroad-base restart during installation
ricardas-buc Oct 5, 2023
23d72ee
chore: enable ForkJoinPool executors for grpc client/server
ricardas-buc Oct 6, 2023
bde5f51
chore: disable rpc server epoll and enable nio implementation
ricardas-buc Oct 9, 2023
c2d50ed
chore: use junit-vintage-engine globally to replace junit4.x
ricardas-buc Oct 14, 2023
6481d83
chore: refactor OpMonitoring buffer
ricardas-buc Oct 14, 2023
d113c98
refactor: from akka to gRPC, environmental monitoring
ovidijusnortal Oct 6, 2023
6a3aaaa
refactor: from akka to gRPC, environmental monitoring
ovidijusnortal Oct 9, 2023
2db369f
refactor: Remove MonitorAgent and related code
ovidijusnortal Oct 13, 2023
90d5581
refactor: remove MonitorAgent
ovidijusnortal Oct 14, 2023
c3e85d7
chore: switch grpc client to nio as well
ricardas-buc Oct 16, 2023
b16ebec
Merge remote-tracking branch 'origin/XRDDEV-2468' into XRDDEV-2468
ricardas-buc Oct 16, 2023
8129864
chore: checkstyle fix
ricardas-buc Oct 16, 2023
ecbbb1d
chore: remove remaining akka references
ricardas-buc Oct 16, 2023
d7c3ec9
Merge remote-tracking branch 'origin/develop' into XRDDEV-2468
ricardas-buc Oct 16, 2023
f568c53
chore: fix an issue where cpuLoad returns NaN which leads to AntiDos …
ricardas-buc Oct 16, 2023
219bef4
Merge branch 'jdk17-macos-compatability-fix' into XRDDEV-2468
ricardas-buc Oct 16, 2023
84c8f12
chore: checkstyle fix
ricardas-buc Oct 16, 2023
5ec3170
Merge remote-tracking branch 'origin/develop' into XRDDEV-2468
ricardas-buc Oct 18, 2023
b686a0b
chore: align grpc properties with already existing patterns
ricardas-buc Oct 18, 2023
85b775f
chore: sonarqube fixes
ricardas-buc Oct 18, 2023
e3d5429
Merge remote-tracking branch 'origin/develop' into XRDDEV-2468
ricardas-buc Oct 18, 2023
e7c7ea6
chore: fix signer test issues in jenkins
ricardas-buc Oct 18, 2023
07502a5
chore: sonarqube fixes
ricardas-buc Oct 18, 2023
6f862c2
chore: minor styling fixes
justasnortal Oct 18, 2023
d28612f
Merge remote-tracking branch 'origin/develop' into XRDDEV-2468
enelir Oct 18, 2023
6f8502a
chore: fix cs ui system tests
ricardas-buc Oct 19, 2023
74afa5d
chore: fix grpc keystore env props
ricardas-buc Oct 19, 2023
32aa8ff
fix: signing key uses
enelir Oct 19, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ legacy/lib/
.settings
*.rpm
.vagrant/
gradle-cache
**/.DS_Store
6 changes: 6 additions & 0 deletions Docker/centralserver/files/cs-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,10 @@ log "Making sure that token pin policy is enforced by default"
if ! crudini --get /etc/xroad/conf.d/local.ini signer enforce-token-pin-policy &>/dev/null; then
crudini --set /etc/xroad/conf.d/local.ini signer enforce-token-pin-policy "true"
fi

#initialize transport keys
mkdir -p -m0750 /var/run/xroad
chown xroad:xroad /var/run/xroad
su - xroad -c sh -c /usr/share/xroad/scripts/xroad-base.sh

exec /usr/bin/supervisord -n -c /etc/supervisor/supervisord.conf
5 changes: 5 additions & 0 deletions Docker/securityserver/files/ss-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,9 @@ then
unset XROAD_TOKEN_PIN
fi

#initialize transport keys
mkdir -p -m0750 /var/run/xroad
chown xroad:xroad /var/run/xroad
su - xroad -c sh -c /usr/share/xroad/scripts/xroad-base.sh

exec /usr/bin/supervisord -n -c /etc/supervisor/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

**Technical Specification** <!-- omit in toc -->

Version: 1.15
Version: 1.16
01.06.2023
<!-- 15 pages -->
Doc. ID: ARC-SS
Expand Down Expand Up @@ -35,6 +35,7 @@ Doc. ID: ARC-SS
| 03.05.2022 | 1.13 | Update `xroad-addon-messagelog` process section | Petteri Kivimäki |
| 01.06.2023 | 1.14 | Update references | Petteri Kivimäki |
| 20.06.2023 | 1.15 | Fixed Security Server Admin API OpenAPI specification link | Madis Loitmaa |
| 03.10.2023 | 1.16 | Remove Akka references | Ričardas Bučiūnas |

## Table of Contents <!-- omit in toc -->

Expand Down Expand Up @@ -332,13 +333,13 @@ The SSCD needs to be a PKCS \#11 (see \[[PKCS11](#Ref_PKCS11)\]) compliant hardw

### 2.13 Environmental Monitoring Service

Provides methods that can be used by X-Road participants to get environmental data of the security server. It requests the data from the local monitoring service via Akka interface and translates it to a SOAP XML response.
Provides methods that can be used by X-Road participants to get environmental data of the security server. It requests the data from the local monitoring service via gRPC interface and translates it to a SOAP XML response.

The component is a proxy addon.

### 2.14 Monitor

Monitor component collects environmental monitoring information such as running processes, available disk space, installed packages etc. The monitoring data is published via Akka and (optional) JMX interfaces.
Monitor component collects environmental monitoring information such as running processes, available disk space, installed packages etc. The monitoring data is published via gRPC and (optional) JMX interfaces.

The component is a separate daemon process.

Expand Down
13 changes: 7 additions & 6 deletions doc/Architecture/arc-tec_x-road_technologies.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

**Technical Specification**

Version: 1.10<br/>
Version: 1.11<br/>
05.10.2023
<!-- 3 pages -->
Doc. ID: ARC-TEC
Expand All @@ -24,6 +24,7 @@ Doc. ID: ARC-TEC
| 26.09.2022 | 1.8 | Remove Ubuntu 18.04 support | Andres Rosenthal |
| 08.06.2023 | 1.9 | Central Server technologies update | Justas Samuolis |
| 05.10.2023 | 1.10 | Update to Java 17 | Justas Samuolis |
| 04.10.2023 | 1.11 | Remove Akka references | Ričardas Bučiūnas |

## Table of Contents

Expand Down Expand Up @@ -81,7 +82,7 @@ Table 1. Technology matrix of the X-Road
| Java 17 | X | X | X | X |
| C | X | X | | |
| Logback | X | X | X | X |
| Akka 2 | X | X | X | X |
| gRPC | X | X | X | X |
| Jetty 9 | X\[[3](#Ref_3)\] | X\[[4](#Ref_4)\] | | |
| Ubuntu 20.04 | X | X | X | X |
| Ubuntu 22.04 | X | X | X | X |
Expand Down Expand Up @@ -129,7 +130,7 @@ Table 2. Technology matrix of the Central Server
| Java 17 | X | | X | | | X | | X |
| C | | X | | | | | | |
| Logback | X | | X | | | X | | X |
| Akka 2 | X | | | | | X | | |
| gRPC | X | | | | | X | | |
| Embedded Jetty 9 | | | X | | | | | |
| Embedded Tomcat 9 | | | | | | X | | |
| Spring Boot 2 | | | X | | | X | | |
Expand Down Expand Up @@ -165,7 +166,7 @@ Table 3. Technology matrix of the configuration proxy
|--------------------------|:--------------:|:---------------------------:|:----------:|:------------------------:|
| Java 17 | | X | X | X |
| Logback | | X | X | X |
| Akka 2 | | X | X | |
| gRPC | | X | X | |
| nginx | X | | | |
| systemd | X | X | X | X |
| PKCS \#11\[[2](#Ref_2)\] | | | X | |
Expand All @@ -187,7 +188,7 @@ Table 4. Technology matrix of the Security Server
| Java 17 | X | X | | X | X | | X | | X | X | X | X | X |
| C | | | X | | | | | | | | | | |
| Logback | X | X | | X | X | | X | | X | | X | X | X |
| Akka 2 | X | X | | X | | | | | X | X | X | X | |
| gRPC | X | X | | X | | | | | X | X | X | X | |
| Embedded Jetty 9 | | X | | | | | | | | | | | |
| Javascript | | | | | | | | X | | | | | |
| PostgreSQL 9+\[[3](#Ref_3)\] | | | | | | X | | | X | | | | |
Expand Down Expand Up @@ -225,7 +226,7 @@ Table 5. Technology matrix of the operational monitoring daemon
|:-----------------------------|:------------------------:|:---------------------:|:--------------------:|:------------------------:|
| Java 17 | X | X | X | X |
| Logback | X | X | X | X |
| Akka 2 | X | X | | |
| gRPC | X | X | | |
| PostgreSQL 9+\[[1](#Ref_1)\] | X | X | | |
| Liquibase 3 | X | X | | |
| Dropwizard Metrics 4 | X | X | | |
Expand Down
31 changes: 16 additions & 15 deletions doc/EnvironmentalMonitoring/Monitoring-architecture.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
# X-Road: Environmental Monitoring Architecture

Version: 1.9
Version: 1.10
Doc. ID: ARC-ENVMON

| Date | Version | Description | Author |
|------------|---------|-----------------------------------------------------------------------------------------------------------------|--------------------|
| 15.12.2015 | 1.0 | Initial version | Ilkka Seppälä |
| 04.01.2017 | 1.1 | Fix documentation links | Ilkka Seppälä |
| 20.01.2017 | 1.2 | Added license text, table of contents and version history | Sami Kallio |
| 23.2.2017 | 1.3 | Added reference to the Security Server targeting extension and moved the modified X-Road protocol details there | Olli Lindgren |
| 18.8.2017 | 1.4 | Added details about the security server certificates monitoring data | Olli Lindgren |
| 18.10.2017 | 1.5 | | Joni Laurila |
| 02.03.2018 | 1.6 | Added numbering, terms document references, removed unnecessary anchors | Tatu Repo
| 20.01.2020 | 1.7 | Update XroadProcessLister description | Jarkko Hyöty
| 25.06.2020 | 1.8 | Add chapter [2.2.1 JMX interface](#221-jmx-interface) | Petteri Kivimäki
| 01.06.2023 | 1.9 | Update references | Petteri Kivimäki |
| Date | Version | Description | Author |
|------------|---------|-----------------------------------------------------------------------------------------------------------------|-------------------|
| 15.12.2015 | 1.0 | Initial version | Ilkka Seppälä |
| 04.01.2017 | 1.1 | Fix documentation links | Ilkka Seppälä |
| 20.01.2017 | 1.2 | Added license text, table of contents and version history | Sami Kallio |
| 23.2.2017 | 1.3 | Added reference to the Security Server targeting extension and moved the modified X-Road protocol details there | Olli Lindgren |
| 18.8.2017 | 1.4 | Added details about the security server certificates monitoring data | Olli Lindgren |
| 18.10.2017 | 1.5 | | Joni Laurila |
| 02.03.2018 | 1.6 | Added numbering, terms document references, removed unnecessary anchors | Tatu Repo |
| 20.01.2020 | 1.7 | Update XroadProcessLister description | Jarkko Hyöty |
| 25.06.2020 | 1.8 | Add chapter [2.2.1 JMX interface](#221-jmx-interface) | Petteri Kivimäki |
| 01.06.2023 | 1.9 | Update references | Petteri Kivimäki |
| 04.10.2023 | 1.10 | Remove Akka references | Ričardas Bučiūnas |


# Table of Contents
Expand Down Expand Up @@ -73,15 +74,15 @@ See X-Road terms and abbreviations documentation \[[TA-TERMS](#Ref_TERMS)\].

### 2.1 Monitoring metaservice (proxymonitor add-on)

Monitoring metaservice responds to queries for monitoring data from security server's serverproxy interface. This metaservice requests the current monitoring data from local monitoring service, using [Akka](http://akka.io/). Monitoring metaservice translates the monitoring data to a SOAP XML response.
Monitoring metaservice responds to queries for monitoring data from security server's serverproxy interface. This metaservice requests the current monitoring data from local monitoring service, using [gRPC](https://grpc.io/). Monitoring metaservice translates the monitoring data to a SOAP XML response.

Monitoring service handles authorization of the requests, see [Access control](#33-access-control). It reads monitoring configuration from distributed global monitoring configuration (see [UC-GCONF, PR-GCONF](#12-references)).

Monitoring metaservice is installed as a proxy add-on, with name `xroad-addon-proxymonitor`.

### 2.2 Monitoring service (xroad-monitor)

Monitoring service is responsible for collecting the monitoring data from one security server instance. It distributes the collected data to monitoring clients (normally the local monitoring metaservice) when requested through an Akka interface.
Monitoring service is responsible for collecting the monitoring data from one security server instance. It distributes the collected data to monitoring clients (normally the local monitoring metaservice) when requested through an gRPC interface.

Monitoring service uses several _sensors_ to collect the data. Sensors and related functionalities are build on top of [Dropwizard Metrics](https://github.com/dropwizard/metrics).

Expand Down
2 changes: 1 addition & 1 deletion doc/EnvironmentalMonitoring/img/monitoring.graphml
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@
<y:Path sx="-0.0" sy="0.0" tx="-0.0" ty="0.0"/>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="none"/>
<y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Liberation Sans" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.40625" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" visible="true" width="57.37890625" x="-28.818661141199357" y="24.404894688015986">&lt;&lt;akka&gt;&gt;<y:LabelModel>
<y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Liberation Sans" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.40625" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" visible="true" width="57.37890625" x="-28.818661141199357" y="24.404894688015986">&lt;&lt;gRPC&gt;&gt;<y:LabelModel>
<y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/>
</y:LabelModel>
<y:ModelParameter>
Expand Down
Binary file modified doc/EnvironmentalMonitoring/img/monitoring.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading