SIENTIAPDE-1017
Enhance OPC ingestor with Redis authentication and update Helm chart configurations. Improve README for clarity on Docker and Kubernetes setup.
This commit is contained in:
@@ -29,6 +29,8 @@ class Ingestor:
|
||||
kafka_servers = getenv("KAFKA_SERVERS", "localhost:9092")
|
||||
self.redis_host = getenv("REDIS_HOST", "localhost")
|
||||
self.redis_port = int(getenv("REDIS_PORT", 6379))
|
||||
self.redis_username = getenv("REDIS_USERNAME", None)
|
||||
self.redis_password = getenv("REDIS_PASSWORD", None)
|
||||
self.lease_ttl = int(getenv("LEASE_TTL", 10))
|
||||
self.heartbeat_ttl = int(getenv("HEARTBEAT_TTL", 20))
|
||||
self.pod_id = getenv("HOSTNAME", "localhost")
|
||||
@@ -103,7 +105,7 @@ class Ingestor:
|
||||
|
||||
self.ingestor_manager = IngestorManager(
|
||||
self.kafka_servers, self.redis_host, self.redis_port, self.lease_ttl,
|
||||
self.heartbeat_ttl, self.pod_id, self.poll_interval, self.logger
|
||||
self.heartbeat_ttl, self.pod_id, self.poll_interval, self.logger, self.redis_username, self.redis_password
|
||||
)
|
||||
|
||||
# Declare ingestor ative
|
||||
|
||||
@@ -11,12 +11,13 @@ class IngestorManager():
|
||||
def __init__(self,
|
||||
kafka_servers: str, redis_host: str, redis_port: int,
|
||||
lease_ttl: int, heartbeat_ttl: int, pod_id: str,
|
||||
poll_interval: int, logger: Logger):
|
||||
poll_interval: int, logger: Logger,
|
||||
redis_username: str = None, redis_password: str = None):
|
||||
|
||||
self.data_manager = DataManager(kafka_servers, logger)
|
||||
self.opc_managers = {}
|
||||
self.resource_manager = ResourceManager(
|
||||
redis_host, redis_port, lease_ttl, heartbeat_ttl, pod_id
|
||||
redis_host, redis_port, lease_ttl, heartbeat_ttl, pod_id, redis_username, redis_password
|
||||
)
|
||||
self.number_of_slots = 0
|
||||
self.poll_interval = poll_interval
|
||||
|
||||
@@ -5,8 +5,10 @@ from redis import Redis
|
||||
|
||||
class ResourceManager:
|
||||
def __init__(self, host: str, port: int,
|
||||
lease_ttl: int, heartbeat_ttl: int, pod_id: str) -> None:
|
||||
self.redis = Redis(host=host, port=port, decode_responses=True)
|
||||
lease_ttl: int, heartbeat_ttl: int, pod_id: str,
|
||||
username: str = None, password: str = None) -> None:
|
||||
self.redis = Redis(host=host, port=port, decode_responses=True,
|
||||
username=username, password=password)
|
||||
self.lease_ttl = lease_ttl
|
||||
self.heartbeat_ttl = heartbeat_ttl
|
||||
self.pod_id = pod_id
|
||||
|
||||
Reference in New Issue
Block a user