@@ -37,10 +37,11 @@
{% block table_head %}
|
{% trans 'Name' %} |
-
{% trans 'Asset' %} |
+
{% trans 'F/S/T' %} |
+
{% trans 'Versions' %} |
+
{% trans 'Hosts' %} |
{% trans 'Success' %} |
-
{% trans 'Finished' %} |
-
{% trans 'Date start' %} |
+
{% trans 'Date' %} |
{% trans 'Time' %} |
{% trans 'Action' %} |
{% endblock %}
@@ -49,26 +50,23 @@
{% for object in task_list %}
| |
- {{ object.name }} |
- {{ object.total_assets|length }} |
+ {{ object.name }} |
- {% if object.is_success %}
+ {{ object.get_all_run_times.failed }}/{{ object.get_all_run_times.success}}/{{ object.get_all_run_times.total}}
+ |
+ {{ object.adhoc.all | length}} |
+ {{ object.get_latest_adhoc.hosts | length}} |
+
+ {% if object.get_latest_history.is_success %}
{% else %}
{% endif %}
|
+ {{ object.get_latest_history.date_start }} |
+ {{ object.get_latest_history.timedelta|floatformat }} s |
- {% if object.is_finished %}
-
- {% else %}
-
- {% endif %}
- |
- {{ object.date_start }} |
- {{ object.timedelta }} s |
-
- {% trans "Run again" %}
+ {% trans "Run" %}
{% trans "Delete" %}
|
diff --git a/apps/ops/test_utils.py b/apps/ops/test_utils.py
index 668ae1f6f..5e5905519 100644
--- a/apps/ops/test_utils.py
+++ b/apps/ops/test_utils.py
@@ -5,17 +5,16 @@ import sys
import os
from django.test import TestCase
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "jumpserver.settings")
-from ops.models import AdHoc, AdHocData
-from ops.utils import run_adhoc
+from ops.models import Task, AdHoc
+from ops.utils import run_adhoc_object
class TestRunAdHoc(TestCase):
def setUp(self):
- adhoc = AdHoc(name="Test run adhoc")
+ adhoc = Task(name="Test run adhoc")
adhoc.save()
- self.data = AdHocData(subject=adhoc, run_as_admin=True, pattern='all')
+ self.data = AdHoc(subject=adhoc, run_as_admin=True, pattern='all')
self.data.tasks = [
{'name': 'run ls', 'action': {'module': 'shell', 'args': 'ls'}},
{'name': 'echo ', 'action': {'module': 'shell', 'args': 'echo 123'}},
diff --git a/apps/ops/urls/api_urls.py b/apps/ops/urls/api_urls.py
index c96bfb926..af16c3de1 100644
--- a/apps/ops/urls/api_urls.py
+++ b/apps/ops/urls/api_urls.py
@@ -7,6 +7,8 @@ from .. import api
router = DefaultRouter()
router.register(r'v1/tasks', api.TaskViewSet, 'task')
+router.register(r'v1/adhoc', api.AdHocViewSet, 'adhoc')
+router.register(r'v1/history', api.AdHocRunHistorySet, 'history')
urlpatterns = []
diff --git a/apps/ops/urls/view_urls.py b/apps/ops/urls/view_urls.py
index 940a7c303..e24f4031d 100644
--- a/apps/ops/urls/view_urls.py
+++ b/apps/ops/urls/view_urls.py
@@ -11,5 +11,7 @@ urlpatterns = [
# TResource Task url
url(r'^task/$', views.TaskListView.as_view(), name='task-list'),
url(r'^task/(?P
[0-9a-zA-Z\-]+)/$', views.TaskDetailView.as_view(), name='task-detail'),
+ url(r'^task/(?P[0-9a-zA-Z\-]+)/adhoc/$', views.TaskAdhocView.as_view(), name='task-adhoc'),
+ url(r'^task/(?P[0-9a-zA-Z\-]+)/history/$', views.TaskHistoryView.as_view(), name='task-history'),
url(r'^task/(?P[0-9a-zA-Z\-]+)/run/$', views.TaskRunView.as_view(), name='task-run'),
]
\ No newline at end of file
diff --git a/apps/ops/utils.py b/apps/ops/utils.py
index 76a6255e8..1bace8351 100644
--- a/apps/ops/utils.py
+++ b/apps/ops/utils.py
@@ -4,20 +4,16 @@ import re
import time
from django.utils import timezone
-from common.utils import get_logger, get_object_or_none
-from .ansible import AdHocRunner
+from common.utils import get_logger, get_object_or_none, get_short_uuid_str
+from .ansible import AdHocRunner, CommandResultCallback
+from .inventory import JMSInventory
from .ansible.exceptions import AnsibleError
-from .models import AdHocRunHistory
-from assets.utils import get_assets_by_hostname_list
+from .models import AdHocRunHistory, Task, AdHoc
logger = get_logger(__file__)
UUID_PATTERN = re.compile(r'[0-9a-zA-Z\-]{36}')
-def run_AdHoc():
- pass
-
-
def is_uuid(s):
if UUID_PATTERN.match(s):
return True
@@ -25,97 +21,133 @@ def is_uuid(s):
return False
-def asset_to_dict(asset):
- return asset.to_json()
+def record_adhoc(func):
+ def _deco(adhoc, **options):
+ record = AdHocRunHistory(adhoc=adhoc)
+ time_start = time.time()
+ try:
+ result = func(adhoc, **options)
+ record.is_finished = True
+ if result.results_summary.get('dark'):
+ record.is_success = False
+ else:
+ record.is_success = True
+ record.result = result.results_raw
+ record.summary = result.results_summary
+ return result
+ finally:
+ record.date_finished = timezone.now()
+ record.timedelta = time.time() - time_start
+ record.save()
+ return _deco
-def asset_to_dict_with_credential(asset):
- return asset._to_secret_json()
-
-
-def system_user_to_dict_with_credential(system_user):
- return system_user._to_secret_json()
-
-
-def get_hosts_with_admin(hostname_list):
- assets = get_assets_by_hostname_list(hostname_list)
- return [asset._to_secret_json for asset in assets]
-
-
-def get_hosts(hostname_list):
- assets = get_assets_by_hostname_list(hostname_list)
- return [asset.to_json for asset in assets]
-
-
-def get_run_user(name):
- from assets.models import SystemUser
- system_user = get_object_or_none(SystemUser, name=name)
- if system_user is None:
- return {}
- else:
- return system_user._to_secret_json()
-
-
-def get_hosts_with_run_user(hostname_list, run_as):
- hosts_dict = get_hosts(hostname_list)
- system_user_dct = get_run_user(run_as)
-
- for host in hosts_dict:
- host.update(system_user_dct)
- return hosts_dict
-
-
-def hosts_add_become(hosts, adhoc_data):
- if adhoc_data.become:
- become_data = {
- "become": {
- "method": adhoc_data.become_method,
- "user": adhoc_data.become_user,
- "pass": adhoc_data.become_pass,
+def get_adhoc_inventory(adhoc):
+ if adhoc.become:
+ become_info = {
+ 'become': {
+ adhoc.become
}
}
- for host in hosts:
- host.update(become_data)
- return hosts
+ else:
+ become_info = None
+
+ inventory = JMSInventory(
+ adhoc.hosts, run_as_admin=adhoc.run_as_admin,
+ run_as=adhoc.run_as, become_info=become_info
+ )
+ return inventory
-def run_adhoc(adhoc_data, **options):
+def get_inventory(hostname_list, run_as_admin=False, run_as=None, become_info=None):
+ return JMSInventory(
+ hostname_list, run_as_admin=run_as_admin,
+ run_as=run_as, become_info=become_info
+ )
+
+
+def get_adhoc_runner(hostname_list, run_as_admin=False, run_as=None, become_info=None):
+ inventory = get_inventory(
+ hostname_list, run_as_admin=run_as_admin,
+ run_as=run_as, become_info=become_info
+ )
+ runner = AdHocRunner(inventory)
+ return runner
+
+
+@record_adhoc
+def run_adhoc_object(adhoc, **options):
"""
- :param adhoc_data: Instance of AdHocData
+ :param adhoc: Instance of AdHoc
:param options: ansible support option, like forks ...
:return:
"""
- name = adhoc_data.subject.name
- hostname_list = adhoc_data.hosts
- if adhoc_data.run_as_admin:
- hosts = get_hosts_with_admin(hostname_list)
- else:
- hosts = get_hosts_with_run_user(hostname_list, adhoc_data.run_as)
- hosts_add_become(hosts, adhoc_data) # admin user 自带become
-
- runner = AdHocRunner(hosts)
+ name = adhoc.task.name
+ inventory = get_adhoc_inventory(adhoc)
+ runner = AdHocRunner(inventory)
for k, v in options:
runner.set_option(k, v)
- record = AdHocRunHistory(adhoc=adhoc_data)
- time_start = time.time()
try:
- result = runner.run(adhoc_data.tasks, adhoc_data.pattern, name)
- record.is_finished = True
- if result.results_summary.get('dark'):
- record.is_success = False
- else:
- record.is_success = True
- record.result = result.results_raw
- record.summary = result.results_summary
+ result = runner.run(adhoc.tasks, adhoc.pattern, name)
return result
except AnsibleError as e:
logger.error("Failed run adhoc {}, {}".format(name, e))
raise
- finally:
- record.date_finished = timezone.now()
- record.timedelta = time.time() - time_start
- record.save()
+def run_adhoc(hostname_list, pattern, tasks, name=None,
+ run_as_admin=False, run_as=None, become_info=None):
+ if name is None:
+ name = "Adhoc-task-{}-{}".format(
+ get_short_uuid_str(),
+ timezone.now().strftime("%Y-%m-%d %H:%M:%S"),
+ )
+ inventory = get_inventory(
+ hostname_list, run_as_admin=run_as_admin,
+ run_as=run_as, become_info=become_info
+ )
+ runner = AdHocRunner(inventory)
+ return runner.run(tasks, pattern, play_name=name)
+
+
+def create_and_run_adhoc(hostname_list, pattern, tasks, name=None,
+ run_as_admin=False, run_as=None, become_info=None):
+ if name is None:
+ name = "Adhoc-task-{}-{}".format(
+ get_short_uuid_str(),
+ timezone.now().strftime("%Y-%m-%d %H:%M:%S"),
+ )
+ task = Task(name=name)
+ task.save()
+ adhoc = AdHoc(
+ task=task, pattern=pattern, name=name,
+ run_as_admin=run_as_admin, run_as=run_as
+ )
+ adhoc.hosts = hostname_list
+ adhoc.tasks = tasks
+ adhoc.become = become_info
+ adhoc.save()
+
+
+def get_task_by_name(name):
+ task = get_object_or_none(Task, name=name)
+ return task
+
+
+def create_task(name, created_by=""):
+ return Task.objects.create(name=name, created_by=created_by)
+
+
+def create_adhoc(task, hosts, tasks, pattern='all', options=None,
+ run_as_admin=False, run_as="",
+ become_info=None, created_by=""):
+ adhoc = AdHoc(task=task, pattern=pattern, run_as_admin=run_as_admin,
+ run_as=run_as, created_by=created_by)
+ adhoc.hosts = hosts
+ adhoc.tasks = tasks
+ adhoc.options = options
+ adhoc.become = become_info
+ adhoc.save()
+ return adhoc
diff --git a/apps/ops/views.py b/apps/ops/views.py
index 8f2afbb0e..a740890a6 100644
--- a/apps/ops/views.py
+++ b/apps/ops/views.py
@@ -9,40 +9,40 @@ from django.views.generic import ListView, DetailView, View
from django.utils import timezone
from django.shortcuts import redirect, reverse
-from .models import AdHoc, AdHocData, AdHocRunHistory
+from .models import Task, AdHoc, AdHocRunHistory
from ops.tasks import rerun_task
class TaskListView(ListView):
paginate_by = settings.CONFIG.DISPLAY_PER_PAGE
- model = AdHoc
- ordering = ('-date_start',)
+ model = Task
+ ordering = ('-date_created',)
context_object_name = 'task_list'
template_name = 'ops/task_list.html'
date_format = '%m/%d/%Y'
keyword = date_from_s = date_to_s = ''
def get_queryset(self):
- date_now = timezone.localtime(timezone.now())
- date_to_default = date_now.strftime(self.date_format)
- date_from_default = (date_now - timezone.timedelta(7)) \
- .strftime(self.date_format)
+ date_to_default = timezone.now()
+ date_from_default = timezone.now() - timezone.timedelta(7)
+ date_from_default_s = date_from_default.strftime(self.date_format)
+ date_to_default_s = date_to_default.strftime(self.date_format)
- self.queryset = super(TaskListView, self).get_queryset()
+ self.queryset = super().get_queryset()
self.keyword = self.request.GET.get('keyword', '')
- self.date_from_s = self.request.GET.get('date_from', date_from_default)
- self.date_to_s = self.request.GET.get('date_to', date_to_default)
+ self.date_from_s = self.request.GET.get('date_from', date_from_default_s)
+ self.date_to_s = self.request.GET.get('date_to', date_to_default_s)
if self.date_from_s:
date_from = datetime.strptime(self.date_from_s, self.date_format)
date_from = date_from.replace(tzinfo=timezone.get_current_timezone())
- self.queryset = self.queryset.filter(date_start__gt=date_from)
+ self.queryset = self.queryset.filter(date_created__gt=date_from)
if self.date_to_s:
date_to = timezone.datetime.strptime(
self.date_to_s + ' 23:59:59', '%m/%d/%Y %H:%M:%S')
date_to = date_to.replace(tzinfo=timezone.get_current_timezone())
- self.queryset = self.queryset.filter(date_finished__lt=date_to)
+ self.queryset = self.queryset.filter(date_created__lt=date_to)
if self.keyword:
self.queryset = self.queryset.filter(
@@ -63,17 +63,42 @@ class TaskListView(ListView):
class TaskDetailView(DetailView):
- model = AdHocRunHistory
+ model = Task
template_name = 'ops/task_detail.html'
def get_context_data(self, **kwargs):
context = {
'app': 'Ops',
- 'action': 'Playbook record detail',
- 'results': json.loads(self.object.summary or '{}'),
+ 'action': 'Task detail',
}
kwargs.update(context)
- return super(TaskDetailView, self).get_context_data(**kwargs)
+ return super().get_context_data(**kwargs)
+
+
+class TaskAdhocView(DetailView):
+ model = Task
+ template_name = 'ops/task_adhoc.html'
+
+ def get_context_data(self, **kwargs):
+ context = {
+ 'app': 'Ops',
+ 'action': 'Task versions',
+ }
+ kwargs.update(context)
+ return super().get_context_data(**kwargs)
+
+
+class TaskHistoryView(DetailView):
+ model = Task
+ template_name = 'ops/task_history.html'
+
+ def get_context_data(self, **kwargs):
+ context = {
+ 'app': 'Ops',
+ 'action': 'Task run history',
+ }
+ kwargs.update(context)
+ return super().get_context_data(**kwargs)
class TaskRunView(View):
diff --git a/apps/perms/tasks.py b/apps/perms/tasks.py
index 6bef200cd..4b66b5727 100644
--- a/apps/perms/tasks.py
+++ b/apps/perms/tasks.py
@@ -3,46 +3,11 @@ from __future__ import absolute_import, unicode_literals
from celery import shared_task
from common.utils import get_logger, encrypt_password
-from ops.utils import run_AdHoc
logger = get_logger(__file__)
@shared_task(bind=True)
def push_users(self, assets, users):
- """
- user: {
- name: 'web',
- username: 'web',
- shell: '/bin/bash',
- password: '123123123',
- public_key: 'string',
- sudo: '/bin/whoami,/sbin/ifconfig'
- }
- """
- if isinstance(users, dict):
- users = [users]
- if isinstance(assets, dict):
- assets = [assets]
- task_tuple = []
-
- for user in users:
- # 添加用户, 设置公钥, 设置sudo
- task_tuple.extend([
- ('user', 'name={} shell={} state=present password={}'.format(
- user['username'], user.get('shell', '/bin/bash'),
- encrypt_password(user.get('password', None)))),
- ('authorized_key', "user={} state=present key='{}'".format(
- user['username'], user['public_key'])),
- ('lineinfile',
- "dest=/etc/sudoers state=present regexp='^{0} ALL=' "
- "line='{0} ALL=(ALL) NOPASSWD: {1}' "
- "validate='visudo -cf %s'".format(
- user['username'], user.get('sudo', '/sbin/ifconfig')
- ))
- ])
- task_name = 'Push user {}'.format(','.join([user['name'] for user in users]))
- task = run_AdHoc(task_tuple, assets, pattern='all',
- task_name=task_name, task_id=self.request.id)
- return task
+ pass
diff --git a/apps/templates/_nav.html b/apps/templates/_nav.html
index 748aa2640..cf7877f6f 100644
--- a/apps/templates/_nav.html
+++ b/apps/templates/_nav.html
@@ -52,7 +52,7 @@
{% trans 'Job Center' %}