Skip to content

slapos
slapos
Commit 4d7cdb1d authored by Alain Takoudjou's avatar Alain Takoudjou Committed by Tristan Cavelier
Browse files
Options

monitor-fix: get collector database path from configuration file

parent d858be30
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 19 deletions
stack/monitor/collect.py
View file @ 4d7cdb1d
...@@ -34,13 +34,9 @@ from datetime import datetime, timedelta ...@@ -34,13 +34,9 @@ from datetime import datetime, timedelta
class Database: class Database:
database_name = "collector.db" def __init__(self, db_path = None):
table_list = ["user", "computer", "system", "disk", \ assert os.path.exists(db_path) and os.path.isfile(db_path)
"temperature", "heating"] self.uri = db_path
def __init__(self, directory = None):
assert self.database_name is not None
self.uri = os.path.join(directory, self.database_name)
self.connection = None self.connection = None
self.cursor = None self.cursor = None
...@@ -109,7 +105,7 @@ class Database: ...@@ -109,7 +105,7 @@ class Database:
self.close() self.close()
if len(sample_amount) and len(memory_sum): if len(sample_amount) and len(memory_sum):
return round(memory_sum[0][0]/sample_amount[0][0], 2) return round(memory_sum[0][0]/(sample_amount[0][0]*1024*1024.0), 2)
def getPartitionConsumption(self, partition_id, where=""): def getPartitionConsumption(self, partition_id, where=""):
self.connect() self.connect()
...@@ -132,7 +128,7 @@ group by pid order by cpu_result desc""" % ( ...@@ -132,7 +128,7 @@ group by pid order by cpu_result desc""" % (
comsumption_list.append([result[6], round((result[1]/count), 2), comsumption_list.append([result[6], round((result[1]/count), 2),
round((result[2]/count), 2), round((result[2]/count), 2),
round(result[3], 2), round((result[4]/count), 2), round(result[3], 2), round((result[4]/count), 2),
round((result[5]/count), 2)]) round((result[5]/(count*1024*1024.0)), 2)])
self.close() self.close()
return comsumption_list return comsumption_list
...@@ -158,6 +154,6 @@ date='%s' and partition='%s' and (time between '%s' and '%s') %s""" % ( ...@@ -158,6 +154,6 @@ date='%s' and partition='%s' and (time between '%s' and '%s') %s""" % (
'cpu_time': round(result[2][0], 2), 'cpu_time': round(result[2][0], 2),
'cpu_num_threads': round(result[3][0], 2), 'cpu_num_threads': round(result[3][0], 2),
'memory_percent': round(result[4][0], 2), 'memory_percent': round(result[4][0], 2),
'memory_rss': round(result[5][0], 2)} 'memory_rss': round(result[5][0]/(1024*1024.0), 2)}
return None return None
stack/monitor/monitor.cfg.in
View file @ 4d7cdb1d
...@@ -200,13 +200,12 @@ recipe = slapos.recipe.template:jinja2 ...@@ -200,13 +200,12 @@ recipe = slapos.recipe.template:jinja2
template = ${ressources-cgi:location}/${ressources-cgi:filename} template = ${ressources-cgi:location}/${ressources-cgi:filename}
rendered = $${monitor-directory:monitoring-cgi}/$${:filename} rendered = $${monitor-directory:monitoring-cgi}/$${:filename}
filename = ressources.cgi filename = ressources.cgi
mode = 0744 mode = $${deploy-settings-cgi:mode}
# XXX - We need to find a proper way to set db_path here, maybe by using zero-parameters ??
context = context =
key monitor_bin monitor-parameters:executable key monitor_bin monitor-parameters:executable
raw python_executable ${buildout:directory}/bin/${extra-eggs:interpreter} raw python_executable ${buildout:directory}/bin/${extra-eggs:interpreter}
key root_folder buildout:directory key root_folder buildout:directory
raw db_path /srv/slapgrid/var/data-log/ raw config_cfg $${buildout:directory}/$${public:filename}
[make-rss] [make-rss]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
...@@ -345,6 +344,7 @@ name = example.com ...@@ -345,6 +344,7 @@ name = example.com
recipe = slapos.cookbook:zero-knowledge.write recipe = slapos.cookbook:zero-knowledge.write
filename = knowledge0.cfg filename = knowledge0.cfg
status-history-length = 5 status-history-length = 5
collect-db-path = /srv/slapgrid/var/data-log/collector.db
[zero-parameters] [zero-parameters]
recipe = slapos.cookbook:zero-knowledge.read recipe = slapos.cookbook:zero-knowledge.read
......
stack/monitor/webfile-directory/ressources.cgi.in
View file @ 4d7cdb1d
...@@ -7,16 +7,32 @@ import os ...@@ -7,16 +7,32 @@ import os
import pwd import pwd
from time import strftime from time import strftime
from datetime import datetime from datetime import datetime
import ConfigParser
import collect import collect
cgitb.enable(display=0, logdir="/tmp/cgi.log") cgitb.enable(display=0, logdir="/tmp/cgi.log")
form = cgi.FieldStorage() form = cgi.FieldStorage()
db_path = "{{ db_path }}" config_file = "{{ config_cfg }}"
action = form.getvalue("action", "") action = form.getvalue("action", "")
home = "{{ root_folder }}".strip() home = "{{ root_folder }}".strip()
db_path = ""
if not os.path.exists(config_file):
print """<html><head></head>
<body><h2>Could not find database path in configuration file.
the file %s might not exist.</h2></body></html>""" % config_file
exit(0)
parser = ConfigParser.ConfigParser()
parser.read(config_file)
try:
db_path = parser.get('public', 'collect-db-path')
except ConfigParser.NoOptionError, e:
print """<html><head></head>
<body><h2>Could not find database path in configuration file.
<br/>%s</h2></body></html>""" % str(e)
exit(0)
if action: if action:
db = collect.Database(directory=db_path) db = collect.Database(db_path=db_path)
stat_info = os.stat(home) stat_info = os.stat(home)
partition_user = pwd.getpwuid(stat_info.st_uid)[0] partition_user = pwd.getpwuid(stat_info.st_uid)[0]
result_dict = {} result_dict = {}
...@@ -44,6 +60,7 @@ else: ...@@ -44,6 +60,7 @@ else:
.tg .tg-s6z2 td{text-align:center} .tg .tg-s6z2 td{text-align:center}
.tg .tg-zapm{background-color:#f9f9f9;} .tg .tg-zapm{background-color:#f9f9f9;}
.tg .tg-4eph{background-color:#f9f9f9} .tg .tg-4eph{background-color:#f9f9f9}
.tg tr:hover td{background-color: #FAFAFA}
.head{ .head{
background-color:#0078e7; background-color:#0078e7;
border:0px solid #ffffff; border:0px solid #ffffff;
...@@ -98,7 +115,7 @@ $(document).ready(function () { ...@@ -98,7 +115,7 @@ $(document).ready(function () {
table1 += '<th class="tg-s6z2">Threads</th><th class="tg-s6z2">Memory Usage</th>'; table1 += '<th class="tg-s6z2">Threads</th><th class="tg-s6z2">Memory Usage</th>';
table1 += '<th class="tg-s6z2">Memory %</th></tr>'; table1 += '<th class="tg-s6z2">Memory %</th></tr>';
table3 = '<tr><th class="tg-s6z2">CPU Load Average</th>'; table3 = '<tr><th class="tg-s6z2">CPU Load Average %</th>';
table3 += '<th class="tg-s6z2">Memory Consumption Average</th></tr>'; table3 += '<th class="tg-s6z2">Memory Consumption Average</th></tr>';
line2 = "<tr class='tg-4eph tg-s6z2'>" line2 = "<tr class='tg-4eph tg-s6z2'>"
...@@ -106,7 +123,7 @@ $(document).ready(function () { ...@@ -106,7 +123,7 @@ $(document).ready(function () {
line2 += "<td>" + result['status']['cpu_percent'] + "</td>"; line2 += "<td>" + result['status']['cpu_percent'] + "</td>";
line2 += "<td>" + result['status']['cpu_time'] + "</td>"; line2 += "<td>" + result['status']['cpu_time'] + "</td>";
line2 += "<td>" + result['status']['cpu_num_threads'] + "</td>"; line2 += "<td>" + result['status']['cpu_num_threads'] + "</td>";
line2 += "<td>" + result['status']['memory_rss'] + "</td>"; line2 += "<td>" + result['status']['memory_rss'] + " Mb</td>";
line2 += "<td>" + result['status']['memory_percent'] + "</td>"; line2 += "<td>" + result['status']['memory_percent'] + "</td>";
line2 += "</tr>"; line2 += "</tr>";
for (var i=0; i<consump.length; i++) { for (var i=0; i<consump.length; i++) {
...@@ -117,14 +134,14 @@ $(document).ready(function () { ...@@ -117,14 +134,14 @@ $(document).ready(function () {
line += "<td>" + consump[i][1] + "</td>"; line += "<td>" + consump[i][1] + "</td>";
line += "<td>" + consump[i][2] + "</td>"; line += "<td>" + consump[i][2] + "</td>";
line += "<td>" + consump[i][3] + "</td>"; line += "<td>" + consump[i][3] + "</td>";
line += "<td>" + consump[i][5] + "</td>"; line += "<td>" + consump[i][5] + " Mb</td>";
line += "<td>" + consump[i][4] + "</td>"; line += "<td>" + consump[i][4] + "</td>";
line += "</tr>"; line += "</tr>";
} }
table3 += "<tr class='tg-4eph tg-s6z2'>" table3 += "<tr class='tg-4eph tg-s6z2'>"
table3 += "<td>" + result['cpu-load'] + "</td>"; table3 += "<td>" + result['cpu-load'] + "</td>";
table3 += "<td>" + result['memory'] + "</td></tr></table>"; table3 += "<td>" + result['memory'] + " Mb</td></tr></table>";
$("#box3").html(table3); $("#box3").html(table3);
$("#box2").html(table2 + line2 + '</table>'); $("#box2").html(table2 + line2 + '</table>');
......
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