github
/
spug
mirror of https://github.com/openspug/spug
1
0
Fork 0
Code Issues Releases Wiki Activity

# 优化推送集成

dependabot/pip/spug_api/paramiko-3.4.0
vapao 2023-11-13 10:46:10 +08:00
parent 60e7ab86bb
commit 06d6bb93cf
3 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spug_api/apps/alarm/views.py
View File

@ -115,19 +115,10 @@ def handle_test(request):
).parse(request.body) ).parse(request.body)
if error is None: if error is None:
notify = Notification(None, '1', 'https://spug.cc', 'Spug官网（测试）', '这是一条测试告警信息', None) notify = Notification(None, '1', 'https://spug.cc', 'Spug官网（测试）', '这是一条测试告警信息', None)
if form.mode in ('1', '2', '4') and not notify.spug_key: if form.mode == '3':
return json_response(error='未配置调用凭据（系统设置/基本设置），请配置后再尝试。')
if form.mode == '1':
notify.monitor_by_wx([form.value])
elif form.mode == '2':
return json_response(error='目前暂不支持短信告警，请关注后续更新。')
elif form.mode == '3':
notify.monitor_by_dd([form.value]) notify.monitor_by_dd([form.value])
elif form.mode == '4': elif form.mode == '4':
notify.monitor_by_email([form.value]) notify.monitor_by_email([form.value])
elif form.mode == '5': elif form.mode == '5':
notify.monitor_by_qy_wx([form.value]) notify.monitor_by_qy_wx([form.value])
else:
return json_response(error='不支持的报警方式')
return json_response(error=error) return json_response(error=error)

6
spug_api/apps/monitor/views.py
View File

@ -36,9 +36,9 @@ class DetectionView(View):
Argument('notify_mode', type=list, help='请选择报警方式'), Argument('notify_mode', type=list, help='请选择报警方式'),
).parse(request.body) ).parse(request.body)
if error is None: if error is None:
if set(form.notify_mode).intersection(['1', '2', '4']): if set(form.notify_mode).intersection(['1', '2', '6']):
if not AppSetting.get_default('spug_key') and not AppSetting.get_default('spug_push_key'): if not AppSetting.get_default('spug_push_key'):
return json_response(error='报警方式 微信、短信、邮件需要配置调用凭据（系统设置/基本设置）或推送服务（系统设置/推送服务设置），请配置后再启用该报警方式。') return json_response(error='报警方式微信、短信、电话需要配置推送服务（系统设置/推送服务设置），请配置后再启用该报警方式。')
form.targets = json.dumps(form.targets) form.targets = json.dumps(form.targets)
form.notify_grp = json.dumps(form.notify_grp) form.notify_grp = json.dumps(form.notify_grp)

8
spug_web/src/pages/alarm/contact/Form.js
View File

@ -76,14 +76,6 @@ export default observer(function () {
</Form.Item> </Form.Item>
<Test mode="4" name="email"/> <Test mode="4" name="email"/>
</Form.Item> </Form.Item>
<Form.Item label="微信Token" extra={
<a target="_blank" rel="noopener noreferrer"
href="https://spug.cc/docs/alarm-contact/">如何获取微信 Token ？</a>}>
<Form.Item noStyle name="wx_token">
<Input placeholder="请输入微信token"/>
</Form.Item>
<Test mode="1" name="wx_token"/>
</Form.Item>
<Form.Item label="钉钉" extra={<span> <Form.Item label="钉钉" extra={<span>
钉钉收不到通知？请参考 钉钉收不到通知？请参考
<a target="_blank" rel="noopener noreferrer" <a target="_blank" rel="noopener noreferrer"