Skip to content

slapos
slapos
Commit 7f658df1 authored by Tristan Cavelier's avatar Tristan Cavelier Committed by Alain Takoudjou
Browse files
Options

monitor: monitor.py.in naming conventions

parent 829b4a61
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 35 deletions
stack/erp5/instance-http-monitor.cfg.in
View file @ 7f658df1
......@@ -8,7 +8,7 @@ parts =
deploy-settings-cgi
deploy-status-cgi
deploy-status-history-cgi
deploy-ressource-monitoring-cgi
deploy-resource-monitoring-cgi
setup-static-files
certificate-authority
zero-parameters
......
stack/monitor/buildout.cfg
View file @ 7f658df1
......@@ -100,12 +100,12 @@ md5sum = d2b85ac31cbbf49c78dc51e90ddf305f
filename = logfile.cgi.in
mode = 0644
[ressources-cgi]
[resource-consumption-cgi]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/webfile-directory/${:filename}
download-only = true
md5sum = 6aed44f5048b58cc01408caf265a3c4d
filename = ressources.cgi.in
md5sum = 61069d8cfd7e7204106c147edc61ebbe
filename = resource-consumption.cgi.in
mode = 0644
[status-cgi]
......
stack/monitor/monitor.cfg.in
View file @ 7f658df1
......@@ -184,8 +184,8 @@ context =
recipe = slapos.recipe.template:jinja2
template = ${logfile-cgi:location}/${logfile-cgi:filename}
rendered = $${monitor-directory:monitoring-cgi}/$${:filename}
filename = Files.cgi
script-path= monitoring/Files.cgi
filename = logfile-tool.cgi
script-path= monitoring/logfile-tool.cgi
mode = 0744
context =
key monitor_bin monitor-parameters:executable
......@@ -196,11 +196,11 @@ context =
[log-folder-cgi]
log-folder = $${monitor-directory:log}
[deploy-ressource-monitoring-cgi]
[deploy-resource-consumption-monitoring-cgi]
recipe = slapos.recipe.template:jinja2
template = ${ressources-cgi:location}/${ressources-cgi:filename}
template = ${resource-consumption-cgi:location}/${resource-consumption-cgi:filename}
rendered = $${monitor-directory:monitoring-cgi}/$${:filename}
filename = ressources.cgi
filename = resource-consumption.cgi
mode = $${deploy-settings-cgi:mode}
context =
key monitor_bin monitor-parameters:executable
......
stack/monitor/monitor.py.in
View file @ 7f658df1
......@@ -129,12 +129,12 @@ def runScripts(directory):
return result
def writeFiles(monitors):
def writeFile(monitor_dict):
timestamp = int(time.time())
db = sqlite3.connect(db_path)
init_db(db)
status = SUCCESS
for key, value in monitors.iteritems():
for key, value in monitor_dict.iteritems():
if value:
element_status = status = FAILURE
else:
......@@ -143,12 +143,12 @@ def writeFiles(monitors):
db.execute("insert into status(timestamp, status) values (?, ?)", (timestamp, status))
db.commit()
db.close()
monitors['datetime'] = time.ctime(timestamp)
json.dump(monitors, open(monitoring_file_json, "w+"))
monitor_dict['datetime'] = time.ctime(timestamp)
json.dump(monitor_dict, open(monitoring_file_json, "w+"))
def main():
parser = OptionParser(option_list=option_list)
monitors = {}
monitor_dict = {}
(options, args) = parser.parse_args()
if not (options.monitor or options.promise
......@@ -156,16 +156,16 @@ def main():
exit("Please provide at list one arg in : -a, -m, -p, -s")
if options.monitor or options.all:
monitors.update(runScripts(monitor_dir))
monitor_dict.update(runScripts(monitor_dir))
if options.promise or options.all:
monitors.update(runScripts(promise_dir))
monitor_dict.update(runScripts(promise_dir))
if options.service or options.all:
monitors.update(runServices(pid_dir))
monitor_dict.update(runServices(pid_dir))
if options.only_stdout:
print json.dumps(monitors)
print json.dumps(monitor_dict)
else:
writeFiles(monitors)
writeFile(monitor_dict)
if __name__ == "__main__":
......
stack/monitor/webfile-directory/ressources.cgi.in → stack/monitor/webfile-directory/resource-consumption.cgi.in
View file @ 7f658df1
......@@ -44,7 +44,7 @@ if action:
partition_user, date_scope)
result_dict['memory'] = db.getPartitionUsedMemoryAverage(
partition_user, date_scope)
print json.dumps(result_dict)
else:
print """<html><head>
......@@ -82,17 +82,17 @@ else:
<script language="javascript" type="text/javascript">
$(document).ready(function () {
var send = false;
autoRefresh();
function autoRefresh() {
refresh();
setTimeout(function(){ autoRefresh(); }, 60000);
}
function refresh() {
if (send) { return}
var dataPost = {'posting-script': "monitoring/ressources.cgi",
var dataPost = {'posting-script': "monitoring/resource-consumption.cgi",
action: "refresh"};
send = true;
$("#msg").fadeIn();
......@@ -109,15 +109,15 @@ $(document).ready(function () {
table2 += '<th class="tg-s6z2">CPU %</th><th class="tg-s6z2">CPU Time</th>';
table2 += '<th class="tg-s6z2">Threads</th><th class="tg-s6z2">Memory Usage</th>';
table2 += '<th class="tg-s6z2">Memory %</th></tr>';
table1 = '<tr><th class="tg-s6z2">Process PID</th>';
table1 += '<th class="tg-s6z2">CPU %</th><th class="tg-s6z2">CPU Time</th>';
table1 += '<th class="tg-s6z2">Threads</th><th class="tg-s6z2">Memory Usage</th>';
table1 += '<th class="tg-s6z2">Memory %</th></tr>';
table3 = '<tr><th class="tg-s6z2">CPU Load Average %</th>';
table3 += '<th class="tg-s6z2">Memory Consumption Average</th></tr>';
line2 = "<tr class='tg-4eph tg-s6z2'>"
line2 += "<td>" + result['status']['total_process'] + "</td>";
line2 += "<td>" + result['status']['cpu_percent'] + "</td>";
......@@ -138,11 +138,11 @@ $(document).ready(function () {
line += "<td>" + consump[i][4] + "</td>";
line += "</tr>";
}
table3 += "<tr class='tg-4eph tg-s6z2'>"
table3 += "<td>" + result['cpu-load'] + "</td>";
table3 += "<td>" + result['memory'] + " Mb</td></tr></table>";
$("#box3").html(table3);
$("#box2").html(table2 + line2 + '</table>');
$("#box1").html(table1 + line + '</table>');
......@@ -155,15 +155,15 @@ $(document).ready(function () {
$("#msg").fadeOut();
});
}
$("#refresh").click(function() {
refresh();
});
});
</script>
</head><body>
<h1>Computer partition ressources monitoring</h1>
<h1>Computer partition resources monitoring</h1>
<div style="width:850px; padding: 10px 0;">
<div style='float:left; width: 500px'>
<table class="tg" id="box3">
......@@ -181,7 +181,7 @@ $(document).ready(function () {
</div>
</div>
<div style='clear:both'></div>
<h2>Total ressources consumption for partition (last minute)</h2>
<h2>Total resources consumption for partition (last minute)</h2>
<table class="tg" id="box2">
<tr>
<th class="tg-s6z2">Total Process</th>
......@@ -192,7 +192,7 @@ $(document).ready(function () {
<th class="tg-s6z2">Memory %</th>
</tr>
</table>
<h2>ressources consumption for partition by process pid (last minute)</h2>
<h2>resources consumption for partition by process pid (last minute)</h2>
<table class="tg" id="box1">
<tr>
<th class="tg-s6z2">Process PID</th>
......@@ -204,4 +204,4 @@ $(document).ready(function () {
</tr>
</table>
<p id="error"></p>
</body></html>"""
\ No newline at end of file
</body></html>"""
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