Skip to content

slapos-caddy
slapos-caddy
Commit bfc1f33d authored by Alain Takoudjou's avatar Alain Takoudjou Committed by Tristan Cavelier
Browse files
Options

monitor: Allow to tail and grep logs remotely

parent 1721e88c
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 16 deletions
stack/monitor/buildout.cfg
View file @ bfc1f33d
...@@ -94,7 +94,7 @@ mode = 0644 ...@@ -94,7 +94,7 @@ mode = 0644
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/webfile-directory/${:filename} url = ${:_profile_base_location_}/webfile-directory/${:filename}
download-only = true download-only = true
md5sum = deeaafd6d370447632eb0d41606f4bbb md5sum = 223d8d98dd557ebc215be71f154629e7
filename = logfile.cgi.in filename = logfile.cgi.in
mode = 0644 mode = 0644
...@@ -155,7 +155,7 @@ mode = 0644 ...@@ -155,7 +155,7 @@ mode = 0644
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
download-only = true download-only = true
md5sum = 22b530ace6497dd1011ee21342fcf4ba md5sum = 7b38b3ab2d6c9ab657c8faf8e3f9b190
filename = logTools.py filename = logTools.py
mode = 0644 mode = 0644
......
stack/monitor/logTools.py
View file @ bfc1f33d
...@@ -168,7 +168,7 @@ def generateRSS(db_path, name, rss_path, url_link, limit=10): ...@@ -168,7 +168,7 @@ def generateRSS(db_path, name, rss_path, url_link, limit=10):
with open(rss_path, 'w') as rss_ouput: with open(rss_path, 'w') as rss_ouput:
rss_ouput.write(rss_feed.to_xml()) rss_ouput.write(rss_feed.to_xml())
def tail(f, lines=20): def tail(f, lines=20, pattern=""):
""" """
Returns the last `lines` lines of file `f`. It is an implementation of tail -f n. Returns the last `lines` lines of file `f`. It is an implementation of tail -f n.
""" """
...@@ -193,7 +193,12 @@ def tail(f, lines=20): ...@@ -193,7 +193,12 @@ def tail(f, lines=20):
size -= linesFound size -= linesFound
bytes -= BUFSIZ bytes -= BUFSIZ
block -= 1 block -= 1
return '\n'.join(''.join(data).splitlines()[-lines:]) lines_list = ''.join(data).splitlines()[-lines:]
if not pattern:
return '\n'.join(lines_list)
else:
return '\n'.join([ line for line in lines_list
if re.search( r"%s" % pattern, line, re.IGNORECASE )])
def readFileFrom(f, lastPosition, limit=20000): def readFileFrom(f, lastPosition, limit=20000):
...@@ -235,4 +240,16 @@ def readFileFrom(f, lastPosition, limit=20000): ...@@ -235,4 +240,16 @@ def readFileFrom(f, lastPosition, limit=20000):
'position': length, 'position': length,
'truncated': truncated 'truncated': truncated
} }
def grep(filepath, pattern):
if not os.path.exists(filepath) or not os.path.isfile(filepath):
return "ERROR: %s is not exist or is not a file" % filepath
match_lines = ""
index = 0
with open(filepath, 'r') as f:
for line in f:
index += 1
if re.search( r"%s" % pattern, line, re.IGNORECASE ):
match_lines += '[line %s] %s\n' % (index, line)
return match_lines
stack/monitor/webfile-directory/logfile.cgi.in
View file @ bfc1f33d
...@@ -13,6 +13,7 @@ form = cgi.FieldStorage() ...@@ -13,6 +13,7 @@ form = cgi.FieldStorage()
base_folder_list = {{ base_folder_list }} base_folder_list = {{ base_folder_list }}
script_path = "{{ script_path }}" script_path = "{{ script_path }}"
logpath = form.getvalue("path", "") logpath = form.getvalue("path", "")
action = form.getvalue("action", "tail")
size = int(form.getvalue("size", "200")) size = int(form.getvalue("size", "200"))
...@@ -39,9 +40,11 @@ print """<html><head> ...@@ -39,9 +40,11 @@ print """<html><head>
padding: 5px; padding: 5px;
} }
textarea {width: 100%; height: 470px; margin-top: 10px;} textarea {width: 100%; height: 470px; margin-top: 10px;}
ul {margin:0px; padding: 0px; list-style: none;} ul.file-list {margin:0px; padding: 0px; list-style: none; height:400px; overflow: auto;}
.button {margin-top: 5px;} .button {margin-top: 5px;}
.button div {margin: 0; margin-right: 10px; float: left; } .button div {margin: 0; margin-right: 10px; float: left; }
.grep {float: left; margin: 5px 0;}
#pattern {width:300px; padding:5px;}
</style> </style>
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
$(document).ready(function () { $(document).ready(function () {
...@@ -65,6 +68,21 @@ $(document).ready(function () { ...@@ -65,6 +68,21 @@ $(document).ready(function () {
return false; return false;
}); });
$( "#grep" ).click(function() {
var file_list = "";
$(".file").each(function () {
if ($(this).children('input[type=checkbox]').is(':checked') ) {
file_list += $(this).attr("rel") + "#";
}
});
if (file_list == "") { return false;}
if ( $("#pattern").val() == "") { return false;}
$("#path").val(file_list);
$("#action").val("grep");
$( "#log_form" ).submit();
return false;
});
$( "#check" ).click(function() { $( "#check" ).click(function() {
$(".file").each(function () { $(".file").each(function () {
var child = $(this).children('input[type=checkbox]'); var child = $(this).children('input[type=checkbox]');
...@@ -94,10 +112,10 @@ $(document).ready(function () { ...@@ -94,10 +112,10 @@ $(document).ready(function () {
$( "#log_form" ).submit(); $( "#log_form" ).submit();
return false; return false;
}); });
var textarea = $("#logcontent") var textarea = $("#logcontent")[0]
if (textarea != undefined) { if ($(textarea) !== undefined) {
$(textarea).animate({ scrollTop: $(textarea)[0].scrollHeight - $(textarea).height() }, "slow"); $(textarea).scrollTop($(textarea)[0].scrollHeight - $(textarea).height());
} }
}); });
</script> </script>
...@@ -108,7 +126,7 @@ if not logpath: ...@@ -108,7 +126,7 @@ if not logpath:
<input type="hidden" name="posting-script" value="%s" /> <input type="hidden" name="posting-script" value="%s" />
<div class="box pure-menu pure-menu-open"> <div class="box pure-menu pure-menu-open">
<h2 class="head">Select file(s) in the list bellow</h2> <h2 class="head">Select file(s) in the list bellow</h2>
<ul>""" % script_path <ul class="file-list">""" % script_path
for base_folder in base_folder_list.values(): for base_folder in base_folder_list.values():
if os.path.exists(base_folder): if os.path.exists(base_folder):
for filename in os.listdir(base_folder): for filename in os.listdir(base_folder):
...@@ -125,12 +143,18 @@ if not logpath: ...@@ -125,12 +143,18 @@ if not logpath:
sub_path = os.path.join(path, sub_filename) sub_path = os.path.join(path, sub_filename)
if os.path.isdir(sub_path): if os.path.isdir(sub_path):
continue continue
print """ <li><a href="#" class="script file" rel="%s" title="%s">%s</a></li>""" % ( print """ <li><a href="#" class="script file" rel="%s" title="%s">
<input type="checkbox" />
%s</a></li>""" % (
sub_path, sub_path, sub_filename) sub_path, sub_path, sub_filename)
print """ </ul> print """ </ul>
</div> </div>
<div class='grep'>
<input type="text" name="pattern" id="pattern" value="" placeholder="type a string | regex here...">
</div>
<div style='clear:both'></div>
<div class="button"> <div class="button">
<div><label for="size">Lines: </label><select name="size" id="size"> <div><label for="size">Tail Lines: </label><select name="size" id="size">
<option value="50" selected>50</option> <option value="50" selected>50</option>
<option value="100">100</option> <option value="100">100</option>
<option value="200">200</option> <option value="200">200</option>
...@@ -139,29 +163,42 @@ if not logpath: ...@@ -139,29 +163,42 @@ if not logpath:
</select></div> </select></div>
<button type="button" class="pure-button pure-button-primary" id="uncheck">Uncheck All</button> <button type="button" class="pure-button pure-button-primary" id="uncheck">Uncheck All</button>
<button type="button" class="pure-button pure-button-primary" id="check">Check All</button> <button type="button" class="pure-button pure-button-primary" id="check">Check All</button>
<button type="button" class="pure-button pure-button-primary" id="open">Open File(s)</button> <button type="button" class="pure-button pure-button-primary" id="open">Tail</button>
<button type="button" class="pure-button pure-button-primary" id="grep">Grep</button>
</div> </div>
<div style='clear:both'></div> <div style='clear:both'></div>
<input type="hidden" name="path" id="path" value="" /> <input type="hidden" name="path" id="path" value="" />
<input type="hidden" name="action" id="action" value="tail" />
</form>""" </form>"""
else: else:
path_list = [x for x in logpath.split('#') if x] path_list = [x for x in logpath.split('#') if x]
log_content = "" log_content = ""
title = "" title = ""
pattern = ""
for filepath in path_list: for filepath in path_list:
if os.path.exists(filepath) and os.path.isfile(filepath): if os.path.exists(filepath) and os.path.isfile(filepath):
title += " " + filepath.split('/')[-1:][0] title += " " + filepath.split('/')[-1:][0]
try: try:
content = logTools.tail(codecs.open(filepath, "r", "utf_8"), size) if action == "tail":
pattern = form.getvalue("pattern", "")
content = logTools.tail(codecs.open(filepath, "r", "utf_8"), size, pattern)
elif action == "grep":
pattern = form.getvalue("pattern")
content = logTools.grep(filepath, pattern)
else:
content = ""
except Exception, e: except Exception, e:
content = str(e) content = str(e)
if content: if content:
log_content += "TAIL FILE %s >>>>\n\n" % filepath log_content += "%s FILE %s >>>>\n\n" % (action.upper(), filepath)
log_content += content + "\n\n\n" log_content += content + "\n\n\n"
print """ print """
<form action="/index.cgi" method="post" class="pure-form-aligned" id="log_form"> <form action="/index.cgi" method="post" class="pure-form-aligned" id="log_form">
<input type="hidden" name="posting-script" value="%s" /> <input type="hidden" name="posting-script" value="%s" />
<input type="hidden" name="path" id="path" value="%s" /> <input type="hidden" name="path" id="path" value="%s" />
<input type="hidden" name="action" id="action" value="%s" />
<input type="hidden" name="pattern" id="pattern" value="%s" />
<input type="hidden" name="size" id="size" value="%s" />
</form> </form>
<div class="box"> <div class="box">
<h2 class="head">Tail: %s </h2> <h2 class="head">Tail: %s </h2>
...@@ -170,8 +207,10 @@ else: ...@@ -170,8 +207,10 @@ else:
<button type="submit" class="pure-button pure-button-primary" id="reload">Refresh</button> <button type="submit" class="pure-button pure-button-primary" id="reload">Refresh</button>
</div> </div>
<div style='clear:both'></div> <div style='clear:both'></div>
<textarea id="logcontent">%s</textarea> <textarea id="logcontent" readonly>%s</textarea>
</div> </div>
""" % (script_path, logpath, title, log_content) """ % (script_path, logpath, action, pattern, size, title, log_content)
if pattern:
print "<p>Pattern string is: %s</p>" % pattern
print """ print """
</body></html>""" </body></html>"""
\ No newline at end of file
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7