Skip to content

J
jumpserver
Commit 67f9aad1 authored by guanghongwei's avatar guanghongwei
Browse files
Options

Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 

Conflicts:
	docs/AddUserAsset.py
parents ac924988 60729c49
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 318 additions and 78 deletions
docs/AddUserAsset.py
View file @ 67f9aad1
...@@ -15,6 +15,7 @@ from jasset.models import Asset, IDC, BisGroup ...@@ -15,6 +15,7 @@ from jasset.models import Asset, IDC, BisGroup
from juser.models import UserGroup, DEPT from juser.models import UserGroup, DEPT
from jasset.views import jasset_group_add from jasset.views import jasset_group_add
from jperm.models import CmdGroup from jperm.models import CmdGroup
from jlog.models import Log
def test_add_idc(): def test_add_idc():
...@@ -87,6 +88,25 @@ def test_add_asset(): ...@@ -87,6 +88,25 @@ def test_add_asset():
print "Add: %s" % ip print "Add: %s" % ip
def test_add_log():
li_date = []
today = datetime.date.today()
oneday = datetime.timedelta(days=1)
for i in range(0, 7):
today = today-oneday
li_date.append(today)
user_list = ['马云', '马化腾', '丁磊', '周鸿祎', '雷军', '柳传志', '陈天桥', '李彦宏', '李开复', '罗永浩']
for i in range(1, 1000):
user = random.choice(user_list)
ip = random.randint(1, 20)
start_time = random.choice(li_date)
end_time = datetime.datetime.now()
log_path = '/var/log/jumpserver/test.log'
host = '192.168.1.' + str(ip)
Log.objects.create(user=user, host=host, log_path=log_path, pid=168, start_time=start_time,
is_finished=1, log_finished=1, end_time=end_time)
if __name__ == '__main__': if __name__ == '__main__':
#test_add_dept() #test_add_dept()
#test_add_group() #test_add_group()
...@@ -95,6 +115,8 @@ if __name__ == '__main__': ...@@ -95,6 +115,8 @@ if __name__ == '__main__':
#test_add_asset_group() #test_add_asset_group()
test_add_asset() test_add_asset()
test_add_user()
test_add_log()
......
jasset/views.py
View file @ 67f9aad1
This diff is collapsed.
jlog/views.py
View file @ 67f9aad1
...@@ -17,19 +17,19 @@ CONF.read('%s/jumpserver.conf' % BASE_DIR) ...@@ -17,19 +17,19 @@ CONF.read('%s/jumpserver.conf' % BASE_DIR)
def log_list_online(request): def log_list_online(request):
header_title, path1, path2 = u'查看日志 | Log List.', u'查看日志', u'在线用户' header_title, path1, path2 = u'查看日志', u'查看日志', u'在线用户'
web_socket_host = CONF.get('websocket', 'web_socket_host') web_socket_host = CONF.get('websocket', 'web_socket_host')
posts = Log.objects.filter(is_finished=0).order_by('-start_time') posts = Log.objects.filter(is_finished=0).order_by('-start_time')
contact_list, p, contacts = pages(posts, request) contact_list, p, contacts, page_range, current_page = pages(posts, request)
return render_to_response('jlog/log_online.html', locals()) return render_to_response('jlog/log_online.html', locals())
def log_list_offline(request): def log_list_offline(request):
header_title, path1, path2 = u'查看日志 | Log List.', u'查看日志', u'历史记录' header_title, path1, path2 = u'查看日志', u'查看日志', u'历史记录'
web_socket_host = CONF.get('websocket', 'web_socket_host') web_socket_host = CONF.get('websocket', 'web_socket_host')
posts = Log.objects.filter(is_finished=1).order_by('-start_time') posts = Log.objects.filter(is_finished=1).order_by('-start_time')
contact_list, p, contacts = pages(posts, request) contact_list, p, contacts, page_range, current_page = pages(posts, request)
return render_to_response('jlog/log_offline.html', locals()) return render_to_response('jlog/log_offline.html', locals())
...@@ -60,10 +60,10 @@ def log_search(request): ...@@ -60,10 +60,10 @@ def log_search(request):
if env == 'online': if env == 'online':
posts = contact_list = Log.objects.filter(Q(user__contains=keyword) | Q(host__contains=keyword)) \ posts = contact_list = Log.objects.filter(Q(user__contains=keyword) | Q(host__contains=keyword)) \
.filter(is_finished=0).order_by('-start_time') .filter(is_finished=0).order_by('-start_time')
contact_list, p, contacts = pages(posts, request) contact_list, p, contacts, page_range, current_page = pages(posts, request)
elif env == 'offline': elif env == 'offline':
posts = contact_list = Log.objects.filter(Q(user__contains=keyword) | Q(host__contains=keyword)) \ posts = contact_list = Log.objects.filter(Q(user__contains=keyword) | Q(host__contains=keyword)) \
.filter(is_finished=1).order_by('-start_time') .filter(is_finished=1).order_by('-start_time')
contact_list, p, contacts = pages(posts, request) contact_list, p, contacts, page_range, current_page = pages(posts, request)
return render_to_response('jlog/log_search.html', locals()) return render_to_response('jlog/log_search.html', locals())
jumpserver/views.py
View file @ 67f9aad1
...@@ -56,27 +56,50 @@ def base(request): ...@@ -56,27 +56,50 @@ def base(request):
return render_to_response('base.html', context_instance=RequestContext(request)) return render_to_response('base.html', context_instance=RequestContext(request))
def index(request): def get_data(data, items, option):
path1, path2 = u'仪表盘', 'Dashboard'
dic = {} dic = {}
li_date, li_str = getDaysByNum(7) li_date, li_str = getDaysByNum(7)
today = datetime.datetime.now().day for item in items:
from_week = datetime.datetime.now() - datetime.timedelta(days=7)
week_data = Log.objects.filter(start_time__range=[from_week, datetime.datetime.now()])
top_ten = week_data.values('user').annotate(times=Count('user')).order_by('-times')[:10]
for user in top_ten:
username = user['user']
li = [] li = []
user_data = week_data.filter(user=username) name = item[option]
if option == 'user':
option_data = data.filter(user=name)
elif option == 'host':
option_data = data.filter(host=name)
for t in li_date: for t in li_date:
year, month, day = t.year, t.month, t.day year, month, day = t.year, t.month, t.day
times = user_data.filter(start_time__year=year, start_time__month=month, start_time__day=day).count() times = option_data.filter(start_time__year=year, start_time__month=month, start_time__day=day).count()
li.append(times) li.append(times)
dic[username] = li dic[name] = li
return dic
def index(request):
path1, path2 = u'仪表盘', 'Dashboard'
users = User.objects.all() users = User.objects.all()
hosts = Asset.objects.all() hosts = Asset.objects.all()
online_host = Log.objects.filter(is_finished=0) online_host = Log.objects.filter(is_finished=0)
online_user = online_host.distinct() online_user = online_host.distinct()
li_date, li_str = getDaysByNum(7)
today = datetime.datetime.now().day
from_week = datetime.datetime.now() - datetime.timedelta(days=7)
week_data = Log.objects.filter(start_time__range=[from_week, datetime.datetime.now()])
user_top_ten = week_data.values('user').annotate(times=Count('user')).order_by('-times')[:10]
host_top_ten = week_data.values('host').annotate(times=Count('host')).order_by('-times')[:10]
user_dic, host_dic = get_data(week_data, user_top_ten, 'user'), get_data(week_data, host_top_ten, 'host')
top = {'user': '活跃用户数', 'host': '活跃主机数', 'times': '登录次数'}
top_dic = {}
for key, value in top.items():
li = []
for t in li_date:
year, month, day = t.year, t.month, t.day
if key != 'times':
times = week_data.filter(start_time__year=year, start_time__month=month, start_time__day=day).values(key).distinct().count()
else:
times = week_data.filter(start_time__year=year, start_time__month=month, start_time__day=day).count()
li.append(times)
top_dic[value] = li
return render_to_response('index.html', locals(), context_instance=RequestContext(request)) return render_to_response('index.html', locals(), context_instance=RequestContext(request))
...@@ -94,10 +117,8 @@ def jasset_group_add(name, comment, jtype): ...@@ -94,10 +117,8 @@ def jasset_group_add(name, comment, jtype):
if BisGroup.objects.filter(name=name): if BisGroup.objects.filter(name=name):
emg = u'该业务组已存在!' emg = u'该业务组已存在!'
else: else:
BisGroup.objects.create(name=name, comment=comment, type=type)
smg = u'业务组%s添加成功' % name
BisGroup.objects.create(name=name, comment=comment, type=jtype) BisGroup.objects.create(name=name, comment=comment, type=jtype)
smg = u'业务组%s添加成功' %name smg = u'业务组%s添加成功' % name
class ServerError(Exception): class ServerError(Exception):
...@@ -111,7 +132,6 @@ def page_list_return(total, current=1): ...@@ -111,7 +132,6 @@ def page_list_return(total, current=1):
return range(min_page, max_page+1) return range(min_page, max_page+1)
def jasset_host_edit(j_id, j_ip, j_idc, j_port, j_type, j_group, j_active, j_comment): def jasset_host_edit(j_id, j_ip, j_idc, j_port, j_type, j_group, j_active, j_comment):
groups = [] groups = []
is_active = {u'是': '1', u'否': '2'} is_active = {u'是': '1', u'否': '2'}
...@@ -144,19 +164,22 @@ def jasset_host_edit(j_id, j_ip, j_idc, j_port, j_type, j_group, j_active, j_com ...@@ -144,19 +164,22 @@ def jasset_host_edit(j_id, j_ip, j_idc, j_port, j_type, j_group, j_active, j_com
def pages(posts, r): def pages(posts, r):
"""分页公用函数"""
contact_list = posts contact_list = posts
p = paginator = Paginator(contact_list, 10) p = paginator = Paginator(contact_list, 20)
try: try:
page = int(r.GET.get('page', '1')) current_page = int(r.GET.get('page', '1'))
except ValueError: except ValueError:
page = 1 current_page = 1
page_range = page_list_return(len(p.page_range), current_page)
try: try:
contacts = paginator.page(page) contacts = paginator.page(current_page)
except (EmptyPage, InvalidPage): except (EmptyPage, InvalidPage):
contacts = paginator.page(paginator.num_pages) contacts = paginator.page(paginator.num_pages)
return contact_list, p, contacts return contact_list, p, contacts, page_range, current_page
def login(request): def login(request):
......
templates/index.html
View file @ 67f9aad1
...@@ -58,16 +58,71 @@ ...@@ -58,16 +58,71 @@
</div> </div>
</div> </div>
</div> </div>
<div id="high" style="width:100%;height:400px;"></div> <div id="top10" style="width:100%;height:400px;"></div>
</br> <div id="usertop10" style="width:100%;height:400px;margin-top:170px"></div>
<div id="dynamic" style="width:100%;height:400px; margin-top:170px"></div> <br/>
<div id="hosttop10" style="width:100%;height:400px;"></div>
<br/>
<div id="dynamic" style="width:100%;height:400px;"></div>
</div> </div>
</div> </div>
<script> <script>
var cate = {{ li_str|safe }}; var cate = {{ li_str|safe }};
$(function () { $(function () {
$('#high').highcharts({ $('#top10').highcharts({
title: {
text: '数据总览',
x: -20 //center
},
subtitle: {
text: 'Source: JumpServer',
x: -20
},
rangeSelector: {
allButtonsEnabled: true,
selected: 2
},
xAxis: {
type: 'datetime',
categories: cate
},
yAxis:{
min: 0,
title: {
text: '登录次数'
},
plotLines: [{
value: 0,
width: 1,
color: '#808080'
}]
},
tooltip: {
valueSuffix: '次'
},
legend: {
layout: 'vertical',
align: 'right',
verticalAlign: 'middle',
borderWidth: 0
},
navigation: {
buttonOptions: {
align: 'right'
}
},
series: [
{% for k,v in top_dic.items %}
{
name: '{{ k }}',
data: {{ v }}
},
{% endfor %}
]
});
$('#usertop10').highcharts({
title: { title: {
text: '一周用户登录TOP10', text: '一周用户登录TOP10',
x: -20 //center x: -20 //center
...@@ -101,7 +156,50 @@ $(function () { ...@@ -101,7 +156,50 @@ $(function () {
borderWidth: 0 borderWidth: 0
}, },
series: [ series: [
{% for k,v in dic.items %} {% for k,v in user_dic.items %}
{
name: '{{ k }}',
data: {{ v }}
},
{% endfor %}
]
});
$('#hosttop10').highcharts({
title: {
text: '一周主机登录TOP10',
x: -20 //center
},
subtitle: {
text: 'Source: JumpServer',
x: -20
},
xAxis: {
type: 'datetime',
categories: cate
},
yAxis:{
min: 0,
title: {
text: '登录次数'
},
plotLines: [{
value: 0,
width: 1,
color: '#808080'
}]
},
tooltip: {
valueSuffix: '次'
},
legend: {
layout: 'vertical',
align: 'right',
verticalAlign: 'middle',
borderWidth: 0
},
series: [
{% for k,v in host_dic.items %}
{ {
name: '{{ k }}', name: '{{ k }}',
data: {{ v }} data: {{ v }}
...@@ -110,6 +208,7 @@ $(function () { ...@@ -110,6 +208,7 @@ $(function () {
] ]
}); });
$(document).ready(function() { $(document).ready(function() {
Highcharts.setOptions({ Highcharts.setOptions({
global: { global: {
......
templates/jasset/group_detail.html
View file @ 67f9aad1
...@@ -62,9 +62,9 @@ ...@@ -62,9 +62,9 @@
<td class="text-center"> {{ post.date_added|date:"Y-m-d H:i:s" }} </td> <td class="text-center"> {{ post.date_added|date:"Y-m-d H:i:s" }} </td>
<td class="text-center" name="j_comment"> {{ post.comment }} </td> <td class="text-center" name="j_comment"> {{ post.comment }} </td>
<td class="text-center" data-editable='false'> <td class="text-center" data-editable='false'>
<a href="/jasset/{{ post.ip }}/" class="iframe btn btn-xs btn-primary">详情</a> <a value="/jasset/{{ post.ip }}/" class="iframe btn btn-xs btn-primary">详情</a>
<a href="/jasset/host_edit/{{ post.id }}" class="btn btn-xs btn-info">编辑</a> <a href="/jasset/host_edit/?id={{ post.id }}" class="btn btn-xs btn-info">编辑</a>
<a href="/jasset/host_del/{{ post.id }}" class="btn btn-xs btn-danger">删除</a> <a href="/jasset/host_del/{{ post.id }}/" class="btn btn-xs btn-danger">删除</a>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
...@@ -80,18 +80,29 @@ ...@@ -80,18 +80,29 @@
<ul class="pagination" style="margin-top: 0; float: right"> <ul class="pagination" style="margin-top: 0; float: right">
{% if contacts.has_previous %} {% if contacts.has_previous %}
<li><a href="?page={{ contacts.previous_page_number }}">&laquo;</a></li> <li class="paginate_button previous" aria-controls="editable" tabindex="0" id="editable_previous">
<a href="?id={{ group_id }}&page={{ contacts.previous_page_number }}">Previous</a>
</li>
{% else %}
<li class="paginate_button previous disabled" aria-controls="editable" tabindex="0" id="editable_previous">
<a href="#">Previous</a>
</li>
{% endif %} {% endif %}
{% for page in page_range %}
{% for page in p.page_range %} {% ifequal current_page page %}
{% ifequal offset1 page %} <li class="paginate_button active" aria-controls="editable" tabindex="0"><a href="?id={{ group_id }}&page={{ page }}" title="第{{ page }}页">{{ page }}</a></li>
<li class="active"><a href="?page={{ page }}" title="第{{ page }}页">{{ page }}</a></li>
{% else %} {% else %}
<li><a href="?page={{ page }}" title="第{{ page }}页">{{ page }}</a></li> <li class="paginate_button" aria-controls="editable" tabindex="0"><a href="?id={{ group_id }}&page={{ page }}" title="第{{ page }}页">{{ page }}</a></li>
{% endifequal %} {% endifequal %}
{% endfor %} {% endfor %}
{% if contacts.has_next %} {% if contacts.has_next %}
<li><a href="?page={{ contacts.next_page_number }}">&raquo;</a></li> <li class="paginate_button next" aria-controls="editable" tabindex="0" id="editable_next">
<a href="?id={{ group_id }}&page={{ contacts.next_page_number }}">Next</a>
</li>
{% else %}
<li class="paginate_button next disabled" aria-controls="editable" tabindex="0" id="editable_next">
<a href="#">Next</a>
</li>
{% endif %} {% endif %}
</ul> </ul>
</div> </div>
...@@ -109,6 +120,21 @@ ...@@ -109,6 +120,21 @@
$('#editable').editableTableWidget(); $('#editable').editableTableWidget();
}); });
$(".iframe").on('click', function(){
var url= $(this).attr("value");
$.layer({
type: 2,
title: 'JumpServer主机详情',
maxmin: true,
shift: 'top',
border: [2, 0.3, '#1AB394'],
shade: [0.5, '#000000'],
shadeClose: true,
area : ['800px' , '600px'],
iframe: {src: url}
});
});
function alter(form) { function alter(form) {
selectData = GetTableDataBox(); selectData = GetTableDataBox();
if (selectData[1] != 0) { if (selectData[1] != 0) {
...@@ -142,7 +168,7 @@ ...@@ -142,7 +168,7 @@
url: "/jasset/group_del_host/group/", url: "/jasset/group_del_host/group/",
data: {"id_list": id_list, "len_list": j, "group_name": group_name}, data: {"id_list": id_list, "len_list": j, "group_name": group_name},
success: function (data) { success: function (data) {
window.open(window.location.pathname, "_self"); window.open(window.location.href, "_self");
} }
}); });
} }
......
templates/jasset/host_list.html
View file @ 67f9aad1
...@@ -91,18 +91,30 @@ ...@@ -91,18 +91,30 @@
<ul class="pagination" style="margin-top: 0; float: right"> <ul class="pagination" style="margin-top: 0; float: right">
{% if contacts.has_previous %} {% if contacts.has_previous %}
<li><a href="?page={{ contacts.previous_page_number }}">&laquo;</a></li> <li class="paginate_button previous" aria-controls="editable" tabindex="0" id="editable_previous">
<a href="?page={{ contacts.previous_page_number }}">Previous</a>
</li>
{% else %}
<li class="paginate_button previous disabled" aria-controls="editable" tabindex="0" id="editable_previous">
<a href="#">Previous</a>
</li>
{% endif %} {% endif %}
{% for page in page_range %}
{% for page in p.page_range %} {% ifequal current_page page %}
{% ifequal offset1 page %} <li class="paginate_button active" aria-controls="editable" tabindex="0"><a href="?page={{ page }}" title="第{{ page }}页">{{ page }}</a></li>
<li class="active"><a href="?page={{ page }}" title="第{{ page }}页">{{ page }}</a></li>
{% else %} {% else %}
<li><a href="?page={{ page }}" title="第{{ page }}页">{{ page }}</a></li> <li class="paginate_button" aria-controls="editable" tabindex="0"><a href="?page={{ page }}" title="第{{ page }}页">{{ page }}</a></li>
{% endifequal %} {% endifequal %}
{% endfor %} {% endfor %}
<li class="paginate_button" aria-controls="editable" tabindex="0"><a href="?page={{ p.num_pages }}" title="第{{ page }}页">...{{ p.num_pages }}</a></li>
{% if contacts.has_next %} {% if contacts.has_next %}
<li><a href="?page={{ contacts.next_page_number }}">&raquo;</a></li> <li class="paginate_button next" aria-controls="editable" tabindex="0" id="editable_next">
<a href="?page={{ contacts.next_page_number }}">Next</a>
</li>
{% else %}
<li class="paginate_button next disabled" aria-controls="editable" tabindex="0" id="editable_next">
<a href="#">Next</a>
</li>
{% endif %} {% endif %}
</ul> </ul>
</div> </div>
......
templates/jasset/host_search.html
View file @ 67f9aad1
...@@ -45,18 +45,29 @@ ...@@ -45,18 +45,29 @@
<ul class="pagination" style="margin-top: 0; float: right"> <ul class="pagination" style="margin-top: 0; float: right">
{% if contacts.has_previous %} {% if contacts.has_previous %}
<li><a href="?page={{ contacts.previous_page_number }}">&laquo;</a></li> <li class="paginate_button previous" aria-controls="editable" tabindex="0" id="editable_previous">
<a href="?id={{ group_id }}&page={{ contacts.previous_page_number }}">Previous</a>
</li>
{% else %}
<li class="paginate_button previous disabled" aria-controls="editable" tabindex="0" id="editable_previous">
<a href="#">Previous</a>
</li>
{% endif %} {% endif %}
{% for page in page_range %}
{% for page in p.page_range %} {% ifequal current_page page %}
{% ifequal offset1 page %} <li class="paginate_button active" aria-controls="editable" tabindex="0"><a href="?keyword={{ keyword }}&page={{ page }}" title="第{{ page }}页">{{ page }}</a></li>
<li class="active"><a href="?page={{ page }}" title="第{{ page }}页">{{ page }}</a></li>
{% else %} {% else %}
<li><a href="?page={{ page }}" title="第{{ page }}页">{{ page }}</a></li> <li class="paginate_button" aria-controls="editable" tabindex="0"><a href="?keyword={{ keyword }}&page={{ page }}" title="第{{ page }}页">{{ page }}</a></li>
{% endifequal %} {% endifequal %}
{% endfor %} {% endfor %}
{% if contacts.has_next %} {% if contacts.has_next %}
<li><a href="?page={{ contacts.next_page_number }}">&raquo;</a></li> <li class="paginate_button next" aria-controls="editable" tabindex="0" id="editable_next">
<a href="?id={{ group_id }}&page={{ contacts.next_page_number }}">Next</a>
</li>
{% else %}
<li class="paginate_button next disabled" aria-controls="editable" tabindex="0" id="editable_next">
<a href="#">Next</a>
</li>
{% endif %} {% endif %}
</ul> </ul>
</div> </div>
......
templates/jasset/idc_detail.html
View file @ 67f9aad1
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<td class="text-center"> {{ post.date_added|date:"Y-m-d H:i:s" }} </td> <td class="text-center"> {{ post.date_added|date:"Y-m-d H:i:s" }} </td>
<td class="text-center" name="j_comment"> {{ post.comment }} </td> <td class="text-center" name="j_comment"> {{ post.comment }} </td>
<td class="text-center" data-editable='false'> <td class="text-center" data-editable='false'>
<a href="/jasset/?id={{ post.ip }}/" class="iframe btn btn-xs btn-primary">详情</a> <a value="/jasset/{{ post.ip }}/" class="iframe btn btn-xs btn-primary">详情</a>
<a href="/jasset/host_del/{{ post.id }}" class="btn btn-xs btn-danger">删除</a> <a href="/jasset/host_del/{{ post.id }}" class="btn btn-xs btn-danger">删除</a>
</td> </td>
</tr> </tr>
...@@ -79,18 +79,29 @@ ...@@ -79,18 +79,29 @@
<ul class="pagination" style="margin-top: 0; float: right"> <ul class="pagination" style="margin-top: 0; float: right">
{% if contacts.has_previous %} {% if contacts.has_previous %}
<li><a href="?page={{ contacts.previous_page_number }}">&laquo;</a></li> <li class="paginate_button previous" aria-controls="editable" tabindex="0" id="editable_previous">
<a href="?id={{ idc_id }}&page={{ contacts.previous_page_number }}">Previous</a>
</li>
{% else %}
<li class="paginate_button previous disabled" aria-controls="editable" tabindex="0" id="editable_previous">
<a href="#">Previous</a>
</li>
{% endif %} {% endif %}
{% for page in page_range %}
{% for page in p.page_range %} {% ifequal current_page page %}
{% ifequal offset1 page %} <li class="paginate_button active" aria-controls="editable" tabindex="0"><a href="?id={{ idc_id }}&page={{ page }}" title="第{{ page }}页">{{ page }}</a></li>
<li class="active"><a href="?page={{ page }}" title="第{{ page }}页">{{ page }}</a></li>
{% else %} {% else %}
<li><a href="?page={{ page }}" title="第{{ page }}页">{{ page }}</a></li> <li class="paginate_button" aria-controls="editable" tabindex="0"><a href="?id={{ idc_id }}&page={{ page }}" title="第{{ page }}页">{{ page }}</a></li>
{% endifequal %} {% endifequal %}
{% endfor %} {% endfor %}
{% if contacts.has_next %} {% if contacts.has_next %}
<li><a href="?page={{ contacts.next_page_number }}">&raquo;</a></li> <li class="paginate_button next" aria-controls="editable" tabindex="0" id="editable_next">
<a href="?id={{ idc_id }}&page={{ contacts.next_page_number }}">Next</a>
</li>
{% else %}
<li class="paginate_button next disabled" aria-controls="editable" tabindex="0" id="editable_next">
<a href="#">Next</a>
</li>
{% endif %} {% endif %}
</ul> </ul>
</div> </div>
...@@ -108,6 +119,21 @@ ...@@ -108,6 +119,21 @@
$('#editable').editableTableWidget(); $('#editable').editableTableWidget();
}); });
$(".iframe").on('click', function(){
var url= $(this).attr("value");
$.layer({
type: 2,
title: 'JumpServer主机详情',
maxmin: true,
shift: 'top',
border: [2, 0.3, '#1AB394'],
shade: [0.5, '#000000'],
shadeClose: true,
area : ['800px' , '600px'],
iframe: {src: url}
});
});
function alter(form) { function alter(form) {
selectData = GetTableDataBox(); selectData = GetTableDataBox();
if (selectData[1] != 0) { if (selectData[1] != 0) {
...@@ -141,7 +167,7 @@ ...@@ -141,7 +167,7 @@
url: "/jasset/group_del_host/idc/", url: "/jasset/group_del_host/idc/",
data: {"id_list": id_list, "len_list": j, "group_name": group_name}, data: {"id_list": id_list, "len_list": j, "group_name": group_name},
success: function (data) { success: function (data) {
window.open(window.location.pathname, "_self"); window.open(window.location.href, "_self");
} }
}); });
} }
......
templates/jasset/idc_list.html
View file @ 67f9aad1
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<td class="text-center"> <a href="/jasset/idc_detail/?id={{ post.id }}">{{ post.asset_set.count }}</a> </td> <td class="text-center"> <a href="/jasset/idc_detail/?id={{ post.id }}">{{ post.asset_set.count }}</a> </td>
<td class="text-center"> {{ post.comment }} </td> <td class="text-center"> {{ post.comment }} </td>
<td class="text-center"> <td class="text-center">
<a href="/jasset/?id={{ post.id }}" class="iframe btn btn-xs btn-primary">详情</a> <a href="/jasset/idc_detail/?id={{ post.id }}" class="iframe btn btn-xs btn-primary">详情</a>
<a href="/jasset/idc_del/{{ post.id }}" class="btn btn-xs btn-danger">删除</a> <a href="/jasset/idc_del/{{ post.id }}" class="btn btn-xs btn-danger">删除</a>
</td> </td>
</tr> </tr>
......
templates/jlog/log_online.html
View file @ 67f9aad1
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
.bootstrap-dialog-message { .bootstrap-dialog-message {
background-color: rgba(0, 0, 0, 0); background-color: rgba(0, 0, 0, 0);
} }
.pre-class {
background-color: rgba(0, 0, 0, 1);
}
.modal-content { .modal-content {
background-color: rgba(0, 0, 0, 0.6); background-color: rgba(0, 0, 0, 0.6);
} }
...@@ -78,7 +81,6 @@ ...@@ -78,7 +81,6 @@
<th class="text-center"> 实时监控 </th> <th class="text-center"> 实时监控 </th>
<th class="text-center"> 阻断 </th> <th class="text-center"> 阻断 </th>
<th class="text-center"> 登录时间 </th> <th class="text-center"> 登录时间 </th>
<th class="text-center"> 结束时间 </th>
</tr> </tr>
</thead> </thead>
...@@ -90,7 +92,6 @@ ...@@ -90,7 +92,6 @@
<td class="text-center"><a class="monitor" filename="{{ post.log_path }}"> 监控 </a></td> <td class="text-center"><a class="monitor" filename="{{ post.log_path }}"> 监控 </a></td>
<td class="text-center"><input type="button" id="cut" class="btn btn-danger btn-xs" name="cut" value="阻断" onclick='cut("{{ post.pid }}")' /></td> <td class="text-center"><input type="button" id="cut" class="btn btn-danger btn-xs" name="cut" value="阻断" onclick='cut("{{ post.pid }}")' /></td>
<td class="text-center"> {{ post.start_time|date:"Y-m-d H:i:s" }} </td> <td class="text-center"> {{ post.start_time|date:"Y-m-d H:i:s" }} </td>
<td class="text-center"> {{ post.end_time|date:"Y-m-d H:i:s" }} </td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
...@@ -144,6 +145,7 @@ ...@@ -144,6 +145,7 @@
var username = $('#username')[0].innerText; var username = $('#username')[0].innerText;
var ip = $('#ip')[0].innerText; var ip = $('#ip')[0].innerText;
BootstrapDialog.show({message:function(){ BootstrapDialog.show({message:function(){
var option, exsit_message;
var escapeString = function (html){ var escapeString = function (html){
var elem = document.createElement('div') var elem = document.createElement('div')
var txt = document.createTextNode(html) var txt = document.createTextNode(html)
...@@ -154,14 +156,23 @@ ...@@ -154,14 +156,23 @@
//告诉服务器端有用户登录 //告诉服务器端有用户登录
socket.emit('login', {userid:message.id, filename:message.filename}); socket.emit('login', {userid:message.id, filename:message.filename});
socket.on('message',function(obj){ socket.on('message',function(obj){
option = obj.option;
console.log(option+'so')
exsit_message = obj.content;
console.log(obj.content)
//去除log中的颜色控制字符 //去除log中的颜色控制字符
var regx = /\x1B\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]/g; var regx = /\x1B\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]/g;
// tag.append('<p>'+escapeString(obj.content.replace(regx,''))+'</p>'); // tag.append('<p>'+escapeString(obj.content.replace(regx,''))+'</p>');
tag.append('<p>'+escapeString(obj.content)+'</p>'); if (option == 'new') {
tag.append('<p>' + escapeString(obj.content) + '</p>');
} else if (option == 'exist') {
tag.append('<p>' + exsit_message + '</p>');
}
tag.animate({ scrollTop: tag[0].scrollHeight}, 1); tag.animate({ scrollTop: tag[0].scrollHeight}, 1);
}); });
tag[0].style.color = "#00FF00"; tag[0].style.color = "#00FF00";
return tag[0]; return tag[0];
} , } ,
title:'Jumpserver实时监控 '+' 登录用户名: '+'<span class="text-info">'+username+'</span>'+' 登录主机: '+'<span class="text-info">'+ip, title:'Jumpserver实时监控 '+' 登录用户名: '+'<span class="text-info">'+username+'</span>'+' 登录主机: '+'<span class="text-info">'+ip,
onhide:function(){ onhide:function(){
......
websocket/index.js
View file @ 67f9aad1
...@@ -26,19 +26,29 @@ io.on('connection', function(socket){ ...@@ -26,19 +26,29 @@ io.on('connection', function(socket){
socket.name = obj.userid; socket.name = obj.userid;
socket.fileName = obj.filename; socket.fileName = obj.filename;
var tail = new Tail(obj.filename); var tail = new Tail(obj.filename);
//console.log(obj.filename);
//2015-03-06 当用户打开监控窗口时，会把已存在的文件内容打印出来
var fs = require('fs');
fs.readFile(obj.filename, 'utf8', function (err,data) {
if (err) {
return console.log(err);
}
var existData = {userid:obj.userid,username:obj.username,content:data,option:'exist'};
socket.emit('message',existData);
});
tail.on('line',function(data) { tail.on('line',function(data) {
//console.log(data); //console.log(data);
var newData = {userid:obj.userid,username:obj.username,content:data}; var newData = {userid:obj.userid,username:obj.username,content:data,option:'new'};
socket.emit('message',newData); socket.emit('message',newData);
}); });
// var tail = spawn("tail", ['-f', obj.filename]); //var tail = spawn("tail", ['-f', obj.filename]);
// tail.stdout.on('data',function(data){ //tail.stdout.on('data',function(data){
// var content = data.toString(); // var content = data.toString();
// //console.log(content); // //console.log(content);
// var newData = {userid:obj.userid,username:obj.username,content:content}; // var newData = {userid:obj.userid,username:obj.username,content:content};
// socket.emit('message',newData); // socket.emit('message',newData);
// }); //});
socket.tail = tail; socket.tail = tail;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment