Merge pull request #225 from Baltic-RCC/dev

Dev
Baltic-RCC · Jan 17, 2025 · 58c8e3a · 58c8e3a
2 parents 81d5b7f + b207f09
commit 58c8e3a
Show file tree

Hide file tree

Showing 22 changed files with 1,153 additions and 776 deletions.
diff --git a/config/cgm_worker/default_area_eic_map.json b/config/cgm_worker/default_area_eic_map.json
@@ -1,7 +1,7 @@
 {
     "10YLT-1001A0008Q": "LT",
     "10YLV-1001A00074": "LV",
-    "10Y1001A1001A39I": "EESTI",
+    "10Y1001A1001A39I": "EE",
     "10YPL-AREA-----S": "PL",
     "10YSE-1--------K": "SE",
     "10YDK-2--------M": "DK2"

diff --git a/config/cgm_worker/replacement_config.json b/config/cgm_worker/replacement_config.json
@@ -5,7 +5,11 @@
             "timeZone": "CET"
         },
         "timeHorizon": {
-            "Request_list": ["ID", "1D", "2D", "WK", "1D"]
+            "Request_list": ["ID", "1D", "2D", "WK", "1D", "MO", "YR"]
+        },
+        "month_ahead": {
+            "hours": ["07:30", "08:30", "09:30", "06:30", "05:30", "04:30"],
+            "business_type": ["1D"]
         },
         "hours": [
             {
@@ -390,15 +394,16 @@
                     {"3": "-P14D"},
                     {"4": "-P1D"},
                     {"5": "-P8D"},
-                    {"6": "-P3D"},
-                    {"7": "-P4D"},
-                    {"8": "-P5D"},
-                    {"9": "-P6D"},
-                    {"10": "-P9D"},
-                    {"11": "-P10D"},
-                    {"12": "-P11D"},
-                    {"13": "-P12D"},
-                    {"14": "-P13D"}
+                    {"6": "-P2D"},
+                    {"7": "-P3D"},
+                    {"8": "-P4D"},
+                    {"9": "-P5D"},
+                    {"10": "-P6D"},
+                    {"11": "-P9D"},
+                    {"12": "-P10D"},
+                    {"13": "-P11D"},
+                    {"14": "-P12D"},
+                    {"15": "-P13D"}
                 ]
             }
         ]

diff --git a/config/cgm_worker/scaler.properties b/config/cgm_worker/scaler.properties
@@ -1,6 +1,6 @@
 [MAIN]
 MAX_ITERATION = 10
-BALANCE_THRESHOLD = 2
+BALANCE_THRESHOLD = 20
 SCALING_CORR_FACTOR = 0
 ELK_INDEX_PATTERN = emfos-schedules*
 DEBUG = True
diff --git a/config/integrations/edx.properties b/config/integrations/edx.properties
@@ -1,4 +1,4 @@
 [MAIN]
-EDX_SERVER = https://ba-opde-acceptance.elering.sise
+EDX_SERVER = access_url
 EDX_USERNAME =
 EDX_PASSWORD = 
diff --git a/config/integrations/elastic.properties b/config/integrations/elastic.properties
@@ -1,3 +1,3 @@
 [MAIN]
-ELK_SERVER = http://test-rcc-logs01.elering.sise:9200
+ELK_SERVER = access_url
 BATCH_SIZE = 20000
diff --git a/config/integrations/minio.properties b/config/integrations/minio.properties
@@ -1,5 +1,5 @@
 [MAIN]
-MINIO_SERVER = test-rcc-minio-fe.elering.sise
+MINIO_SERVER = access_url
 MINIO_USERNAME = None
 MINIO_PASSWORD = None
 TOKEN_EXPIRATION = 86400

diff --git a/config/integrations/opdm.properties b/config/integrations/opdm.properties
@@ -1,8 +1,8 @@
 [MAIN]
-OPDM_SERVER = https://ba-opde-acceptance.elering.sise:8443
+OPDM_SERVER = access_url
 OPDM_USERNAME = None
 OPDM_PASSWORD = None
 
-WEBDAV_SERVER = https://ba-opde-acceptance-files.elering.sise/local-storage
+WEBDAV_SERVER = access_url
 WEBDAV_USERNAME = None
 WEBDAV_PASSWORD = None
diff --git a/config/integrations/rabbit.properties b/config/integrations/rabbit.properties
@@ -1,6 +1,6 @@
 [MAIN]
-RMQ_SERVER = test-rscrabbit.elering.sise
-RMQ_PORT = 5670
+RMQ_SERVER = access_url
+RMQ_PORT = access_port
 RMQ_VHOST = /
 RMQ_USERNAME = None
 RMQ_PASSWORD = None

diff --git a/config/logging/custom_logger.properties b/config/logging/custom_logger.properties
@@ -1,5 +1,5 @@
 [MAIN]
 LOGGING_INDEX = emfos-logs
-LOGGING_FORMAT = %(levelname) -10s %(asctime) -10s %(name) -50s %(funcName) -50s %(lineno) -5d: %(message)s
+LOGGING_FORMAT = %(levelname) -10s %(asctime) -20s %(name) -60s %(funcName) -35s %(lineno) -5d: %(message)s
 LOGGING_DATEFMT = %Y-%m-%d %H:%M:%S
 LOGGING_LEVEL = INFO