monitor: monitor.py.in naming conventions

7f658df1 · Tristan Cavelier · Alain Takoudjou · 829b4a61 · 7f658df1 · 7f658df1
Commit 7f658df1 authored Feb 27, 2015 by Tristan Cavelier Committed by Alain Takoudjou Mar 31, 2015
5 changed files
--- a/stack/erp5/instance-http-monitor.cfg.in
+++ b/stack/erp5/instance-http-monitor.cfg.in
@@ -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

--- a/stack/monitor/buildout.cfg
+++ b/stack/monitor/buildout.cfg
@@ -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]

--- a/stack/monitor/monitor.cfg.in
+++ b/stack/monitor/monitor.cfg.in
@@ -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

--- a/stack/monitor/monitor.py.in
+++ b/stack/monitor/monitor.py.in
@@ -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__":

--- a/stack/monitor/webfile-directory/ressources.cgi.in
+++ b/stack/monitor/webfile-directory/ressources.cgi.in
@@ -92,7 +92,7 @@ $(document).ready(function () {

  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();
@@ -163,7 +163,7 @@ $(document).ready(function () {
 });
 </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>