NASP/argus
51
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

完成a6000测试系统构建、部署、测试整合 #35

Merged
yuyr merged 18 commits from dev_1.0.0_yuyr_5 into dev_1.0.0 2025-10-29 10:04:29 +08:00
Conversation 3 Commits 18 Files Changed 143 +2 -1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 23f0f4fca4 - Show all commits

2
src/alert/alertmanager/build/supervisord.conf
View File

@ -6,7 +6,7 @@ user=root
[program:alertmanager] [program:alertmanager]
command=/usr/local/bin/start-am-supervised.sh command=/usr/local/bin/start-am-supervised.sh
user=alertmanager user=ubuntu
stdout_logfile=/var/log/supervisor/alertmanager.log stdout_logfile=/var/log/supervisor/alertmanager.log
stderr_logfile=/var/log/supervisor/alertmanager_error.log stderr_logfile=/var/log/supervisor/alertmanager_error.log
autorestart=true autorestart=true

1
src/web/build_tools/proxy/conf.d/ports.conf
View File

@ -69,6 +69,7 @@ server {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_hide_header Access-Control-Allow-Origin;
add_header 'Access-Control-Allow-Origin' $cors_allow always; add_header 'Access-Control-Allow-Origin' $cors_allow always;
add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always; add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always;
add_header 'Access-Control-Allow-Headers' 'Origin, Content-Type, Accept, Authorization' always; add_header 'Access-Control-Allow-Headers' 'Origin, Content-Type, Accept, Authorization' always;