From b47db28180e3ae57dd7045e47b5a5c7847915128 Mon Sep 17 00:00:00 2001 From: David BRAQUART Date: Wed, 18 Dec 2024 16:08:22 +0100 Subject: [PATCH 1/3] rename spreadsheet-config-server --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f3cd2e4..999144d 100644 --- a/README.md +++ b/README.md @@ -318,16 +318,16 @@ This service is responsible for managing users data. This is the back-end entry This service is responsible for storing parameters coming from GridSuite front-ends. A parameter is a key value (String, String) type data associated to a user and an application (just a String like 'study' or 'merge'). Thanks to this service, front-ends can have their states saved (like options in parameters dialog) and users are able to keep the same UI configuration on different machines and browsers. -### Spreadsheet config server +### Study config server - Kind: Web service with a REST API -- Source repository: https://github.com/gridsuite/spreadsheet-config-server +- Source repository: https://github.com/gridsuite/study-config-server - Storage: PostgreSQL - Connected to message broker: no - Other services dependencies: none - Use PowSyBl libraries: no -This service is responsible for storing and managing spreadsheet configurations. A spreadsheet configuration is a set of columns that can be used to display network data in a tabular form. This service is used by GridStudy and GridExplore front-ends. +This service is responsible for storing and managing study-related configurations, like spreadsheet configuration and network visualization parameters. A spreadsheet configuration is a set of columns that can be used to display network data in a tabular form. This service is used by GridStudy and GridExplore front-ends. ### Balances adjustment server - Kind: Web service with a REST API From 4bc9191662d2083aa6d4cc5c09a9316648b2ff2f Mon Sep 17 00:00:00 2001 From: David BRAQUART Date: Fri, 20 Dec 2024 16:26:38 +0100 Subject: [PATCH 2/3] restore valid drawio file from commit db17, and remove arrow again --- diagrams/gridsuite_architecture.drawio | 106 ++++++++++++++++++++----- 1 file changed, 88 insertions(+), 18 deletions(-) diff --git a/diagrams/gridsuite_architecture.drawio b/diagrams/gridsuite_architecture.drawio index 29dfb8c..6469368 100644 --- a/diagrams/gridsuite_architecture.drawio +++ b/diagrams/gridsuite_architecture.drawio @@ -1,6 +1,6 @@ - + - + @@ -380,6 +380,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -639,23 +666,22 @@ - + - - - + + - + - + @@ -667,7 +693,7 @@ - + @@ -711,16 +737,36 @@ - + - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -991,13 +1037,37 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + From 7ee8afef84a01e2bd520517c71e63ef0bf03ae7c Mon Sep 17 00:00:00 2001 From: David BRAQUART Date: Fri, 20 Dec 2024 19:28:05 +0100 Subject: [PATCH 3/3] update with study-config server --- diagrams/gridsuite_architecture.drawio | 60 +++++++++++++++++--------- diagrams/gridsuite_architecture.svg | 2 +- 2 files changed, 41 insertions(+), 21 deletions(-) diff --git a/diagrams/gridsuite_architecture.drawio b/diagrams/gridsuite_architecture.drawio index 6469368..59cbaa4 100644 --- a/diagrams/gridsuite_architecture.drawio +++ b/diagrams/gridsuite_architecture.drawio @@ -1,6 +1,6 @@ - + @@ -393,9 +393,10 @@ - + + @@ -572,7 +573,7 @@ - + @@ -612,8 +613,8 @@ - - + + @@ -624,7 +625,7 @@ - + @@ -781,7 +782,7 @@ - + @@ -1002,36 +1003,36 @@ - - + + - + - + - - + - + - + - - + + - - + + - + + @@ -1089,6 +1090,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/diagrams/gridsuite_architecture.svg b/diagrams/gridsuite_architecture.svg index 2e1f6b7..d2531c6 100644 --- a/diagrams/gridsuite_architecture.svg +++ b/diagrams/gridsuite_architecture.svg @@ -1,4 +1,4 @@ -
index with metadata
case available
upload case
Case server
wait for IGMs
Rabbit MQ
FTP
upload case
polling
case import job
(k8s cron)
download IGM
search IGM
import IGM
ajust balance on CGM
run SA on CGM
validate IGM
Elastic search
load/save
load/save
load/save
Network store server
Balance adjustment server
load contingencies
store / load results
Security analysis server
Loadflow server
notifications

run LF on CGM
Merge orchestration server
PostgreSQL
Actions server
PostgreSQL
load/save
Case validation server
Websocket
Merge notification server
polling
CGMES assembling job
(k8s cron)
run / get resuts
run / get results
run / get results
Study server
Single line diagram server
Network conversion server
Network modification server
Network map server
Geo data server
PostgreSQL
CGMES GL server
ODRE server
Geo data app
(UI)
GridMerge
File system
Kibana
(UI)
GridStudy
PostgreSQL
Config server
Websocket
Study notification server
GridExplore
PostgreSQL
Filter server
PostgreSQL
CGMES boundary server
PostgreSQL
Directory server
Dynamic mapping server
GridDyna
Websocket
Websocket
Config notification server
Explore server
send results
get mapping
Dynamic simulation server
Report server
PostgreSQL
PostgreSQL
Directory notification server
Websocket
Sensitivity analysis server
run / get resuts
PostgreSQL
store / load results
load filters

load contingencies

User admin server
PostgreSQL
Shortcircuit server
PostgreSQL
store / load results
Spreadsheet config server
PostgreSQL
Dynamic security analysis server
store time-series
Time-series server
PostgreSQL
get output state
User identity OIDC replication server
 \ No newline at end of file +
index with metadata
index with metadata
case available
case available
upload case
upload case
Case server
Case server
wait for IGMs
wait for IGMs
Rabbit MQ
Rabbit MQ
FTP
FTP
upload case
upload case
polling
polling
case import job
(k8s cron)
case import job...
download IGM
search IGM
download IGM...
import IGM
import IGM
ajust balance on CGM
ajust balance on CGM
run SA on CGM
run SA on CGM
validate IGM
validate IGM
Elastic search
Elastic se...
load/save
load/save
load/save
load/save
load/save
load/save
Network store server
Network store server
Balance adjustment server
Balance adjustment s...
load contingencies
load contingencies
store / load results
store / load results
Security analysis server
Security analysis se...
Loadflow server
Loadflow server
notifications
notifications

run LF on CGM
 run LF on CGM
Merge orchestration server
Merge orchestration...
PostgreSQL
PostgreSQL
Actions server
Actions server
PostgreSQL
PostgreSQL
load/save
load/save
Case validation server
Case validation serv...
Websocket
Websocket
Merge notification server
Merge notification s...
polling
polling
CGMES assembling job
(k8s cron)
CGMES assembling job...
run / get resuts
run / get resuts
run / get results
run / get results
run / get results
run / get results
Study server
Study server
Single line diagram server
Single line diagram...
Network conversion server
Network conversion s...
Network modification server
Network modification...
Network map server
Network map server
Geo data server
Geo data server
PostgreSQL
PostgreSQL
CGMES GL server
CGMES GL server
ODRE server
ODRE server
Geo data app
(UI)
Geo data app...
GridMerge
GridMerge
File system
File system
Kibana
(UI)
Kibana...
GridStudy
GridStudy
PostgreSQL
PostgreSQL
Config server
Config server
Websocket
Websocket
Study notification server
Study notification s...
GridExplore
GridExplore
PostgreSQL
PostgreSQL
Filter server
Filter server
PostgreSQL
PostgreSQL
CGMES boundary server
CGMES boundary server
PostgreSQL
PostgreSQL
Directory server
Directory server
Dynamic mapping server
Dynamic mapping serv...
GridDyna
GridDyna
Websocket
Websocket
Websocket
Websocket
Config notification server
Config notification...
Explore server
Explore server
send results
send results
get mapping
get mapping
Dynamic simulation server
Dynamic simulation s...
Report server
Report server
PostgreSQL
PostgreSQL
PostgreSQL
PostgreSQL
Directory notification server
Directory notificati...
Websocket
Websocket
Sensitivity analysis server
Sensitivity analysis...
run / get resuts
run / get resuts
PostgreSQL
PostgreSQL
store / load results
store / load results
load filters

load filters
load contingencies

load contingencies
User admin server
User admin server
PostgreSQL
PostgreSQL
Shortcircuit server
Shortcircuit server
PostgreSQL
PostgreSQL
store / load results
store / load results
Study config server
Study config server
PostgreSQL
PostgreSQL
Dynamic security analysis server
Dynamic security ana...
store time-series
store time-series
Time-series server
Time-series server
PostgreSQL
PostgreSQL
get output state
get output state
User identity OIDC replication server
User identity OIDC r...Text is not SVG - cannot display \ No newline at end of file