From 8d402fb15663770ace02e695750d2c8e9c412967 Mon Sep 17 00:00:00 2001 From: vitor-aignosi Date: Fri, 7 Nov 2025 09:20:48 -0300 Subject: [PATCH] SIENTIAPDE-1325 SIENTIAPDE-1325 Add OPC server name configuration and update repository handling - Introduced a new environment variable `OPC_SERVER_NAME` in values.yaml with a default value. - Updated the OPC class to include `server_name` when initializing OpcRepository. - Enhanced the configuration builder to retrieve `OPC_SERVER_NAME` from the environment. - Adjusted OpcRepository to store and utilize the `server_name` for metric emissions. --- laborious/activities/opc.py | 1 + laborious/utils/connectors_config.py | 1 + laborious/utils/repository/opc_repository.py | 4 +++- values.yaml | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/laborious/activities/opc.py b/laborious/activities/opc.py index 839b0d1..6099e38 100644 --- a/laborious/activities/opc.py +++ b/laborious/activities/opc.py @@ -79,6 +79,7 @@ class OPC(SientiaMonitoring): for opc_id, server in self.opc_servers.items(): self.opc_repository[opc_id] = OpcRepository( opc_id=server['id'], + server_name=server['server_name'], url=server['url'], logger=self.logger, server_uri=server['server_uri'], diff --git a/laborious/utils/connectors_config.py b/laborious/utils/connectors_config.py index 7501a07..ba8cd4a 100644 --- a/laborious/utils/connectors_config.py +++ b/laborious/utils/connectors_config.py @@ -88,6 +88,7 @@ def build_opc_config() -> dict[str, Any]: return { getenv('OPC_ID', '1'): { 'id': getenv('OPC_ID', '1'), + 'server_name': getenv('OPC_SERVER_NAME', 'default_server'), 'url': getenv('OPC_URL', 'opc.tcp://localhost:4840'), 'server_uri': getenv('OPC_SERVER_URI', 'opc.tcp://localhost:4840'), 'cert_path': getenv('OPC_CERT_PATH', None), diff --git a/laborious/utils/repository/opc_repository.py b/laborious/utils/repository/opc_repository.py index b103de8..cc62e1c 100644 --- a/laborious/utils/repository/opc_repository.py +++ b/laborious/utils/repository/opc_repository.py @@ -46,6 +46,7 @@ class OpcRepository(SientiaMonitoring): self, opc_id: str, url: str, + server_name: str, logger: Logger, notification_handler: NotificationHandler, metrics_controller: MetricsController, @@ -57,6 +58,7 @@ class OpcRepository(SientiaMonitoring): ): self.url = url self.id = opc_id + self.server_name = server_name self.server_uri = server_uri self.cert_path = cert_path self.private_key_path = private_key_path @@ -172,7 +174,7 @@ class OpcRepository(SientiaMonitoring): tags = { 'pod_id': self.pod_id, - 'opc_server_id': self.id, + 'server_name': self.server_name, } await self.emit_metric( diff --git a/values.yaml b/values.yaml index 114a394..f8ad89e 100644 --- a/values.yaml +++ b/values.yaml @@ -182,6 +182,8 @@ env: - name: OPC_ID value: "1" + - name: OPC_SERVER_NAME + value: "default_server" - name: OPC_URL value: "opc.tcp://sientia-opc-simulator-opc.sientia.svc.cluster.local:4840"