maxjhandsome
/
sysom1
mirror of https://gitee.com/anolis/sysom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(monitor.conf): Yaml config error

This commit is contained in:
SunnyQjm 2023-03-10 16:58:04 +08:00
parent 18a6bb43b6
commit 40efdcbba0
3 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conf/config.yml
View File

@ -1,14 +1,12 @@
# sysom_server config
sysom_global:
path:
# root_path: &global_root_path "/usr/local/sysom"
root_path: &global_root_path "/root/sysom"
root_path: &global_root_path "/usr/local/sysom"
# Unified configuration of Server
sysom_server:
path:
# root_path: !concat [&global_root_path, "server/target/sysom_server"]
root_path: !concat [*global_root_path, "/sysom_server"]
root_path: !concat [*global_root_path, "server/target/sysom_server"]
db:
redis:
host: localhost
@ -36,7 +34,7 @@ sysom_server:
# Unified configuration of Web
sysom_web:
path:
root_path: !concat [*global_root_path, "/sysom_web"]
root_path: !concat [*global_root_path, "server/target/sysom_web"]
# Unified configuration of Node
sysom_node:

6
sysom_server/sysom_monitor_server/conf/common.py
View File

@ -6,12 +6,8 @@ Email mfeng@linux.alibaba.com
File common.py
Description:
"""
import os
from pathlib import Path
from lib.adddict import Dict
import yaml
from yamlinclude import YamlIncludeConstructor
from sysom_utils import YamlConcatConstructor, ConfigParser
from sysom_utils import ConfigParser
# sysom_monitor_server root path
BASE_DIR = Path(__file__).resolve().parent.parent

27
sysom_server/sysom_monitor_server/config.yml
View File

@ -1,13 +1,17 @@
vars:
NODE_EXPORT_BASE_DOWNLOAD_URL: &NODE_EXPORT_BASE_DOWNLOAD_URL https://sysom.oss-cn-beijing.aliyuncs.com/monitor/
NODE_EXPORT_VERSION: &NODE_EXPORT_VERSION 1.5.0
SERVICE_NAME: &SERVICE_NAME sysom_monitor
SERVICE_NAME: &SERVICE_NAME sysom_monitor
SERVICE_CONSUMER_GROUP:
!concat &SERVICE_CONSUMER_GROUP [*SERVICE_NAME, "_consumer_group"]
sysom_server:
cec:
consumer_group: *SERVICE_CONSUMER_GROUP
channel_job:
target_topic: SYSOM_CEC_CHANNEL_TOPIC
listen_topic: SYSOM_CEC_CHANNEL_MONITOR_TOPIC
consumer_group: SYSOM_CEC_CHANNEL_MONITOR_TOPIC
consumer_group: *SERVICE_CONSUMER_GROUP
sysom_service:
service_name: *SERVICE_NAME
@ -31,13 +35,24 @@ sysom_node:
amd64: &node_delivery_files_amd64
- *code_delivery_files_comm
- local: node_exporter-1.5.0.linux-amd64.tar.gz
remote: !concat [*NODE_EXPORT_BASE_DOWNLOAD_URL, "node_exporter-", *NODE_EXPORT_VERSION, ".linux-amd64.tar.gz"]
remote:
!concat [
*NODE_EXPORT_BASE_DOWNLOAD_URL,
"node_exporter-",
*NODE_EXPORT_VERSION,
".linux-amd64.tar.gz",
]
arm64:
- *code_delivery_files_comm
- local: node_exporter-1.5.0.linux-arm64.tar.gz
remote: !concat [*NODE_EXPORT_BASE_DOWNLOAD_URL, "node_exporter-", *NODE_EXPORT_VERSION, ".linux-arm64.tar.gz"]
x86_64:
- *node_delivery_files_amd64
remote:
!concat [
*NODE_EXPORT_BASE_DOWNLOAD_URL,
"node_exporter-",
*NODE_EXPORT_VERSION,
".linux-arm64.tar.gz",
]
x86_64: *node_delivery_files_amd64
scripts:
prepare: node_prepare.sh
init: node_init.sh