mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-05-11 01:33:02 +00:00
* perf: change i18n
* perf: pam
* perf: change translate
* perf: add check account
* perf: add date field
* perf: add account filter
* perf: remove some js
* perf: add account status action
* perf: update pam
* perf: 修改 discover account
* perf: update filter
* perf: update gathered account
* perf: 修改账号同步
* perf: squash migrations
* perf: update pam
* perf: change i18n
* perf: update account risk
* perf: 更新风险发现
* perf: remove css
* perf: Admin connection token
* perf: Add a switch to check connectivity after changing the password, and add a custom ssh command for push tasks
* perf: Modify account migration files
* perf: update pam
* perf: remove to check account dir
* perf: Admin connection token
* perf: update check account
* perf: 优化发送结果
* perf: update pam
* perf: update bulk update create
* perf: prepaire using thread timer for bulk_create_decorator
* perf: update bulk create decorator
* perf: 优化 playbook manager
* perf: 优化收集账号的报表
* perf: Update poetry
* perf: Update Dockerfile with new base image tag
* fix: Account migrate 0012 file
* perf: 修改备份
* perf: update pam
* fix: Expand resource_type filter to include raw type
* feat: PAM Service (#14552)
* feat: PAM Service
* perf: import package name
---------
Co-authored-by: jiangweidong <1053570670@qq.com>
* perf: Change secret dashboard (#14551)
Co-authored-by: feng <1304903146@qq.com>
* perf: update migrations
* perf: 修改支持 pam
* perf: Change secret record table dashboard
* perf: update status
* fix: Automation send report
* perf: Change secret report
* feat: windows accounts gather
* perf: update change status
* perf: Account backup
* perf: Account backup report
* perf: Account migrate
* perf: update service to application
* perf: update migrations
* perf: update logo
* feat: oracle accounts gather (#14571)
* feat: oracle accounts gather
* feat: sqlserver accounts gather
* feat: postgresql accounts gather
* feat: mysql accounts gather
---------
Co-authored-by: wangruidong <940853815@qq.com>
* feat: mongodb accounts gather
* perf: Change secret
* perf: Migrate
* perf: Merge conflicting migration files
* perf: Change secret
* perf: Automation filter org
* perf: Account push
* perf: Random secret string
* perf: Enhance SQL query and update risk handling in accounts
* perf: Ticket filter assignee_id
* perf: 修改 account remote
* perf: 修改一些 adhoc 任务
* perf: Change secret
* perf: Remove push account extra api
* perf: update status
* perf: The entire organization can view activity log
* fix: risk field check
* perf: add account details api
* perf: add demo mode
* perf: Delete gather_account
* perf: Perfect solution to account version problem
* perf: Update status action to handle multiple accounts
* perf: Add GatherAccountDetailField and update serializers
* perf: Display account history in combination with password change records
* perf: Lina translate
* fix: Update mysql_filter to handle nested user info
* perf: Admin connection token validate_permission account
* perf: copy move account
* perf: account filter risk
* perf: account risk filter
* perf: Copy move account failed message
* fix: gather account sync account to asset
* perf: Pam dashboard
* perf: Account dashboard total accounts
* perf: Pam dashboard
* perf: Change secret filter account secret_reset
* perf: 修改 risk filter
* perf: pam translate
* feat: Check for leaked duplicate passwords. (#14711)
* feat: Check for leaked duplicate passwords.
* perf: Use SQLite instead of txt as leak password database
---------
Co-authored-by: jiangweidong <1053570670@qq.com>
Co-authored-by: 老广 <ibuler@qq.com>
* perf: merge with remote
* perf: Add risk change_password_add handle
* perf: Pam dashboard
* perf: check account manager import
* perf: 重构扫描
* perf: 修改 db
* perf: Gather account manager
* perf: update change db lib
* perf: dashboard
* perf: Account gather
* perf: 修改 asset get queryset
* perf: automation report
* perf: Pam account
* perf: Pam dashboard api
* perf: risk add account
* perf: 修改 risk check
* perf: Risk account
* perf: update risk add reopen action
* perf: add pylintrc
* Revert "perf: automation report"
This reverts commit 22aee54207
.
* perf: check account engine
* perf: Perf: Optimism Gather Report Style
* Perf: Remove unuser actions
* Perf: Perf push account
* perf: perf gather account
* perf: Automation report
* perf: Push account recorder
* perf: Push account record
* perf: Pam dashboard
* perf: perf
* perf: update intergration
* perf: integrations application detail add account tab page
* feat: Custom change password supports configuration of interactive items
* perf: Go and Python demo code
* perf: Custom secret change
* perf: add user filter
* perf: translate
* perf: Add demo code docs
* perf: update some i18n
* perf: update some i18n
* perf: Add Java, Node, Go, and cURL demo code
* perf: Translate
* perf: Change secret translate
* perf: Translate
* perf: update some i18n
* perf: translate
* perf: Ansible playbook
* perf: update some choice
* perf: update some choice
* perf: update account serializer remote unused code
* perf: conflict
* perf: update import
---------
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: wangruidong <940853815@qq.com>
Co-authored-by: jiangweidong <1053570670@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
Co-authored-by: zhaojisen <1301338853@qq.com>
139 lines
4.4 KiB
Python
139 lines
4.4 KiB
Python
# -*- coding: utf-8 -*-
|
||
#
|
||
import json
|
||
|
||
import redis
|
||
import redis_lock
|
||
from django.conf import settings
|
||
from django.db.utils import ProgrammingError, OperationalError
|
||
from django.utils.timezone import get_current_timezone
|
||
from django_celery_beat.models import (
|
||
PeriodicTask, IntervalSchedule, CrontabSchedule, PeriodicTasks
|
||
)
|
||
|
||
from common.utils import get_logger
|
||
from common.utils.timezone import local_now
|
||
|
||
logger = get_logger(__name__)
|
||
|
||
|
||
def create_or_update_celery_periodic_tasks(tasks):
|
||
"""
|
||
:param tasks: {
|
||
'add-every-monday-morning': {
|
||
'task': 'tasks.add' # A registered celery task,
|
||
'interval': 30,
|
||
'crontab': "30 7 * * *",
|
||
'args': (16, 16),
|
||
'kwargs': {},
|
||
'enabled': False,
|
||
'description': ''
|
||
},
|
||
}
|
||
:return:
|
||
"""
|
||
# Todo: check task valid, task and callback must be a celery task
|
||
for name, detail in tasks.items():
|
||
interval = None
|
||
crontab = None
|
||
last_run_at = None
|
||
|
||
try:
|
||
IntervalSchedule.objects.all().count()
|
||
except (ProgrammingError, OperationalError):
|
||
return None
|
||
|
||
if isinstance(detail.get("interval"), int):
|
||
kwargs = dict(
|
||
every=detail['interval'],
|
||
period=IntervalSchedule.SECONDS,
|
||
)
|
||
# 不能使用 get_or_create,因为可能会有多个
|
||
interval = IntervalSchedule.objects.filter(**kwargs).first()
|
||
if interval is None:
|
||
interval = IntervalSchedule.objects.create(**kwargs)
|
||
last_run_at = local_now()
|
||
elif isinstance(detail.get("crontab"), str):
|
||
try:
|
||
minute, hour, day, month, week = detail["crontab"].split()
|
||
except ValueError:
|
||
logger.error("crontab is not valid")
|
||
return
|
||
kwargs = dict(
|
||
minute=minute, hour=hour, day_of_week=week,
|
||
day_of_month=day, month_of_year=month, timezone=get_current_timezone()
|
||
)
|
||
crontab = CrontabSchedule.objects.filter(**kwargs).first()
|
||
if crontab is None:
|
||
crontab = CrontabSchedule.objects.create(**kwargs)
|
||
else:
|
||
logger.warning("Schedule is not valid: %s" % name)
|
||
return
|
||
|
||
defaults = dict(
|
||
interval=interval,
|
||
crontab=crontab,
|
||
name=name,
|
||
task=detail['task'],
|
||
args=json.dumps(detail.get('args', [])),
|
||
kwargs=json.dumps(detail.get('kwargs', {})),
|
||
description=detail.get('description') or '',
|
||
last_run_at=last_run_at,
|
||
)
|
||
enabled = detail.get('enabled')
|
||
if enabled is not None:
|
||
defaults["enabled"] = enabled
|
||
task = PeriodicTask.objects.update_or_create(
|
||
defaults=defaults, name=name,
|
||
)
|
||
PeriodicTasks.update_changed()
|
||
return task
|
||
|
||
|
||
def disable_celery_periodic_task(task_name):
|
||
from django_celery_beat.models import PeriodicTask
|
||
PeriodicTask.objects.filter(name=task_name).update(enabled=False)
|
||
PeriodicTasks.update_changed()
|
||
|
||
|
||
def delete_celery_periodic_task(task_name):
|
||
from django_celery_beat.models import PeriodicTask
|
||
PeriodicTask.objects.filter(name=task_name).delete()
|
||
PeriodicTasks.update_changed()
|
||
|
||
|
||
def get_celery_periodic_task(task_name):
|
||
from django_celery_beat.models import PeriodicTask
|
||
task = PeriodicTask.objects.filter(name=task_name).first()
|
||
return task
|
||
|
||
|
||
def get_celery_task_log_path(task_id):
|
||
from ops.utils import get_task_log_path
|
||
return get_task_log_path(settings.CELERY_LOG_DIR, task_id)
|
||
|
||
|
||
def get_celery_status():
|
||
from . import app
|
||
i = app.control.inspect()
|
||
ping_data = i.ping() or {}
|
||
active_nodes = [k for k, v in ping_data.items() if v.get('ok') == 'pong']
|
||
active_queue_worker = set([n.split('@')[0] for n in active_nodes if n])
|
||
# Celery Worker 数量: 2
|
||
if len(active_queue_worker) < 2:
|
||
print("Not all celery worker worked")
|
||
return False
|
||
else:
|
||
return True
|
||
|
||
|
||
def get_beat_status():
|
||
CONFIG = settings.CONFIG
|
||
r = redis.Redis(host=CONFIG.REDIS_HOST, port=CONFIG.REDIS_PORT, password=CONFIG.REDIS_PASSWORD)
|
||
lock = redis_lock.Lock(r, name="beat-distribute-start-lock")
|
||
try:
|
||
locked = lock.locked()
|
||
return locked
|
||
except redis.ConnectionError:
|
||
return False
|