4 Commits

2 changed files with 10 additions and 6 deletions

View File

@@ -27,9 +27,10 @@ def check_docker():
click.echo('Please start docker correctly', err=True)
raise
if not docker.compose.is_installed():
click.echo('Please install docker-compose first', err=True)
raise
# TODO 目前在某些系统环境的检查不准确,暂时去除这个检查逻辑
# if not docker.compose.is_installed():
# click.echo('Please install docker-compose first', err=True)
# raise
@contextmanager
@@ -108,7 +109,7 @@ def start_statsd_agent():
def start_statsd_exporter():
with status(f'Starting statsd exporter'):
statsd_mapping_file_path = os.path.join('.', 'statsd_mapping.yml')
statsd_mapping_file_path = os.path.join(os.getcwd(), 'statsd_mapping.yml')
returned_string = docker.run(image='prom/statsd-exporter:latest', name='statsd-exporter', pull='missing',
detach=True, restart='always', tty=True, hostname='statsd-exporter',
publish=[(9125, 9125, 'udp'), (9102, 9102)], interactive=True,
@@ -135,7 +136,7 @@ def start_grafana():
grafana_conf_dir = os.path.join(get_directory('chassis-agent'), 'metric-configs')
grafana_provisioning_path = os.path.join(grafana_conf_dir, 'grafana_conf/provisioning')
grafana_config_path = os.path.join(grafana_conf_dir, 'grafana_conf/config/grafana.ini')
grafana_dashboard_path = os.path.join('.', 'grafana_dashboards')
grafana_dashboard_path = os.path.join(os.getcwd(), 'grafana_dashboards')
returned_string = docker.run(image='grafana/grafana:latest', name='grafana', hostname='grafana',
detach=True, restart='always', tty=True, interactive=True,
publish=[(3100, 3000)], pull='missing',
@@ -324,6 +325,9 @@ def metric_config_gen(module, class_name_str):
import sys
from statsd.client.timer import Timer
sys.path.append(os.getcwd())
for root, dirs, files in os.walk(os.getcwd()):
for _dir in dirs:
sys.path.append(os.path.join(root, _dir))
# Extract information of statsd config from the class of nameko service
file_name = module.split('.')[-1]

View File

@@ -9,7 +9,7 @@ with open(path.join(here, 'README.md'), encoding='utf-8') as f:
setup(
name='namekoplus',
version='0.4.8',
version='0.4.12',
description='A lightweight Python distributed microservice solution',
long_description=long_description,
long_description_content_type='text/markdown',