Skip to content

Remove Telegram notifications #1001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dmytrotkk wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Remove Telegram notifications #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,6 @@ Required environment variables in `ENV_FILE`:

Optional variables:

* `TG_API_KEY` - Telegram API key
* `TG_CHAT_ID` - Telegram chat ID
* `MONITORING_CONTAINERS` - Enable monitoring containers (`cadvisor`, `node-exporter`).

#### Node initialization from backup
Expand Down
16 changes: 6 additions & 10 deletions node_cli/operations/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def update(settings: BaseNodeSettings, compose_env: dict, node_mode: NodeMode) -
node_type=NodeType.SKALE,
node_mode=node_mode,
)
compose_up(env=compose_env, settings=settings, node_type=NodeType.SKALE, node_mode=node_mode)
compose_up(env=compose_env, node_type=NodeType.SKALE, node_mode=node_mode)
return True


Expand Down Expand Up @@ -203,7 +203,7 @@ def init(settings: BaseNodeSettings, compose_env: dict, node_mode: NodeMode) ->
node_type=NodeType.SKALE,
node_mode=node_mode,
)
compose_up(env=compose_env, settings=settings, node_type=NodeType.SKALE, node_mode=node_mode)
compose_up(env=compose_env, node_type=NodeType.SKALE, node_mode=node_mode)
return True


Expand Down Expand Up @@ -267,9 +267,7 @@ def init_passive(
node_type=NodeType.SKALE,
node_mode=NodeMode.PASSIVE,
)
compose_up(
env=compose_env, settings=settings, node_type=NodeType.SKALE, node_mode=NodeMode.PASSIVE
)
compose_up(env=compose_env, node_type=NodeType.SKALE, node_mode=NodeMode.PASSIVE)


def update_passive(settings: BaseNodeSettings, compose_env: dict) -> bool:
Expand Down Expand Up @@ -319,9 +317,7 @@ def update_passive(settings: BaseNodeSettings, compose_env: dict) -> bool:
node_type=NodeType.SKALE,
node_mode=NodeMode.PASSIVE,
)
compose_up(
env=compose_env, settings=settings, node_type=NodeType.SKALE, node_mode=NodeMode.PASSIVE
)
compose_up(env=compose_env, node_type=NodeType.SKALE, node_mode=NodeMode.PASSIVE)
return True


Expand Down Expand Up @@ -367,7 +363,7 @@ def turn_on(

save_internal_settings(node_type=node_type, node_mode=node_mode, backup_run=backup_run)
logger.info('Launching containers on the node...')
compose_up(env=compose_env, settings=settings, node_type=node_type, node_mode=node_mode)
compose_up(env=compose_env, node_type=node_type, node_mode=node_mode)


def restore(
Expand Down Expand Up @@ -413,7 +409,7 @@ def restore(
)
save_internal_settings(node_type=node_type, node_mode=node_mode, backup_run=backup_run)
if not config_only:
compose_up(env=compose_env, settings=settings, node_type=node_type, node_mode=node_mode)
compose_up(env=compose_env, node_type=node_type, node_mode=node_mode)

failed_checks = run_host_checks(
settings.block_device,
Expand Down
10 changes: 3 additions & 7 deletions node_cli/operations/fair.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ def init_fair_boot(

compose_up(
env=compose_env,
settings=settings,
node_type=NodeType.FAIR,
node_mode=NodeMode.ACTIVE,
is_fair_boot=True,
Expand Down Expand Up @@ -165,7 +164,6 @@ def init(
)
compose_up(
env=compose_env,
settings=settings,
node_type=NodeType.FAIR,
node_mode=node_mode,
services=list(REDIS_SERVICE_DICT),
Expand All @@ -188,7 +186,7 @@ def init(
distro.version(),
)

compose_up(env=compose_env, settings=settings, node_type=NodeType.FAIR, node_mode=node_mode)
compose_up(env=compose_env, node_type=NodeType.FAIR, node_mode=node_mode)
wait_for_container(BASE_PASSIVE_FAIR_COMPOSE_SERVICES['api'])
time.sleep(REDIS_START_TIMEOUT)
return True
Expand Down Expand Up @@ -243,7 +241,6 @@ def update_fair_boot(
)
compose_up(
env=compose_env,
settings=settings,
node_type=NodeType.FAIR,
node_mode=NodeMode.ACTIVE,
is_fair_boot=True,
Expand Down Expand Up @@ -304,7 +301,6 @@ def update(

compose_up(
env=compose_env,
settings=settings,
node_type=NodeType.FAIR,
node_mode=node_mode,
services=list(REDIS_SERVICE_DICT),
Expand All @@ -314,7 +310,7 @@ def update(
if update_type == FairUpdateType.FROM_BOOT:
migrate_chain_record(settings.env_type, settings.node_version)
update_chain_record(settings.env_type, force_skaled_start=force_skaled_start)
compose_up(env=compose_env, settings=settings, node_type=NodeType.FAIR, node_mode=node_mode)
compose_up(env=compose_env, node_type=NodeType.FAIR, node_mode=node_mode)
return True


Expand Down Expand Up @@ -354,7 +350,7 @@ def restore(
)

if not config_only:
compose_up(env=compose_env, settings=settings, node_type=NodeType.FAIR, node_mode=node_mode)
compose_up(env=compose_env, node_type=NodeType.FAIR, node_mode=node_mode)

failed_checks = run_host_checks(
settings.block_device,
Expand Down
16 changes: 0 additions & 16 deletions node_cli/utils/docker_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
from docker.errors import NotFound
from docker.models.containers import Container

from skale_core.settings import BaseNodeSettings

from node_cli.configs import (
COMPOSE_PATH,
FAIR_COMPOSE_PATH,
Expand Down Expand Up @@ -95,8 +93,6 @@
**REDIS_SERVICE_DICT,
}

NOTIFICATION_COMPOSE_SERVICES = ('celery',)

DOCKER_DEFAULT_STOP_TIMEOUT = 20

DOCKER_DEFAULT_HEAD_LINES = 400
Expand Down Expand Up @@ -311,7 +307,6 @@ def get_up_compose_cmd(

def compose_up(
env,
settings: BaseNodeSettings,
node_type: NodeType,
node_mode: NodeMode,
is_fair_boot: bool = False,
Expand Down Expand Up @@ -351,17 +346,6 @@ def compose_up(
logger.debug('Launching skale node containers with env %s', env)
run_cmd(cmd=get_up_compose_cmd(node_type=node_type, node_mode=node_mode), env=env)

if settings.tg_api_key and settings.tg_chat_id:
logger.info('Running containers for Telegram notifications')
run_cmd(
cmd=get_up_compose_cmd(
node_type=NodeType.SKALE,
node_mode=node_mode,
services=list(NOTIFICATION_COMPOSE_SERVICES),
),
env=env,
)


def restart_nginx_container(dutils=None):
dutils = dutils or docker_client()
Expand Down
5 changes: 2 additions & 3 deletions tests/utils/api_auth_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,7 @@ def run(cmd, env):

start = Mock(side_effect=run)
monkeypatch.setattr(docker_utils, 'run_cmd', start)
settings = Mock(tg_api_key=None)
docker_utils.compose_up({}, settings, NodeType.SKALE, NodeMode.ACTIVE)
docker_utils.compose_up({}, NodeType.SKALE, NodeMode.ACTIVE)
start.assert_called_once()


Expand All @@ -153,5 +152,5 @@ def test_invalid_token_prevents_starting_services(token_path, monkeypatch):
start = Mock()
monkeypatch.setattr(docker_utils, 'run_cmd', start)
with pytest.raises(api_auth.APIAuthError):
docker_utils.compose_up({}, Mock(), NodeType.SKALE, NodeMode.ACTIVE)
docker_utils.compose_up({}, NodeType.SKALE, NodeMode.ACTIVE)
start.assert_not_called()
Loading