Leave only removing telegraf during update/turn-off

node_cli/operations/base.py

@@ -45,7 +45,6 @@
 )
 from node_cli.operations.docker_lvmpy import lvmpy_install  # noqa
 from node_cli.operations.skale_node import download_skale_node, sync_skale_node, update_images
-from node_cli.operations.telegraf import generate_telegraf_config, get_telegraf_options
 from node_cli.core.checks import CheckType, run_checks as run_host_checks
 from node_cli.core.iptables import configure_iptables
 from node_cli.utils.docker_utils import (
@@ -139,9 +138,6 @@ def update(env_filepath: str, env: Dict) -> None:
         distro.version()
     )
     update_images(env.get('CONTAINER_CONFIGS_DIR') != '')
-    if env.get('TELEGRAF'):
-        options = get_telegraf_options(env)
-        generate_telegraf_config(options)
     compose_up(env)
     return True
 
@@ -179,10 +175,6 @@ def init(env_filepath: str, env: dict) -> bool:
     update_resource_allocation(env_type=env['ENV_TYPE'])
     update_images(env.get('CONTAINER_CONFIGS_DIR') != '')
 
-    if env.get('TELEGRAF'):
-        options = get_telegraf_options(env)
-        generate_telegraf_config(options)
-
     compose_up(env)
     return True
 
@@ -234,10 +226,6 @@ def init_sync(
     update_resource_allocation(env_type=env['ENV_TYPE'])
     update_images(env.get('CONTAINER_CONFIGS_DIR') != '', sync_node=True)
 
-    if env.get('TELEGRAF'):
-        options = get_telegraf_options(env)
-        generate_telegraf_config(options)
-
     compose_up(env, sync_node=True)
     return True
 
@@ -280,10 +268,6 @@ def update_sync(env_filepath: str, env: Dict) -> bool:
     )
     update_images(env.get('CONTAINER_CONFIGS_DIR') != '', sync_node=True)
 
-    if env.get('TELEGRAF'):
-        options = get_telegraf_options(env)
-        generate_telegraf_config(options)
-
     compose_up(env, sync_node=True)
     return True
 

node_cli/utils/docker_utils.py

@@ -41,6 +41,7 @@
 
 SCHAIN_REMOVE_TIMEOUT = 300
 IMA_REMOVE_TIMEOUT = 20
+TELEGRAF_REMOVE_TIMEOUT = 20
 
 MAIN_COMPOSE_CONTAINERS = ('skale-api', 'bounty', 'skale-admin')
 BASE_COMPOSE_SERVICES = (
@@ -86,11 +87,13 @@ def get_all_ima_containers(_all=True) -> list:
     return docker_client().containers.list(all=_all, filters={'name': 'skale_ima_*'})
 
 
-def remove_dynamic_containers():
+def remove_dynamic_containers() -> None:
     logger.info('Removing sChains containers')
     rm_all_schain_containers()
     logger.info('Removing IMA containers')
     rm_all_ima_containers()
+    logger.info('Removing telegraf (if exists)')
+    remove_telegraf()
 
 
 def rm_all_schain_containers():
@@ -103,6 +106,11 @@ def rm_all_ima_containers():
     remove_containers(ima_containers, timeout=IMA_REMOVE_TIMEOUT)
 
 
+def remove_telegraf() -> None:
+    telegraf = docker_client().containers.list(filters={'name': 'skale_telegraf'})
+    remove_containers(telegraf, timeout=TELEGRAF_REMOVE_TIMEOUT)
+
+
 def remove_containers(containers, timeout):
     for container in containers:
         safe_rm(container, timeout=timeout)
@@ -248,9 +256,6 @@ def compose_up(env, sync_node=False):
     if str_to_bool(env.get('MONITORING_CONTAINERS', 'False')):
         logger.info('Running monitoring containers')
         run_cmd(cmd=get_up_compose_cmd(MONITORING_COMPOSE_SERVICES), env=env)
-    if str_to_bool(env.get('TELEGRAF', 'False')):
-        logger.info('Running monitoring containers')
-        run_cmd(cmd=get_up_compose_cmd(TELEGRAF_SERVICES), env=env)
     if 'TG_API_KEY' in env and 'TG_CHAT_ID' in env:
         logger.info('Running containers for Telegram notifications')
         run_cmd(cmd=get_up_compose_cmd(NOTIFICATION_COMPOSE_SERVICES), env=env)