Skip to content

slapos
slapos
Commit 44cc3774 authored by Tristan Cavelier's avatar Tristan Cavelier
Browse files
Options

fix typos 

ressource => resource
parent 9caeeebd
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
software/slapos-master/instance-balancer.cfg.in
View file @ 44cc3774
...@@ -282,7 +282,7 @@ parts += ...@@ -282,7 +282,7 @@ parts +=
cron-entry-rss cron-entry-rss
deploy-index deploy-index
deploy-logfile-cgi deploy-logfile-cgi
deploy-ressource-monitoring-cgi deploy-resource-monitoring-cgi
setup-static-files setup-static-files
public-symlink public-symlink
cgi-httpd-wrapper cgi-httpd-wrapper
......
software/slapos-master/instance-zope.cfg.in
View file @ 44cc3774
...@@ -472,7 +472,7 @@ parts += ...@@ -472,7 +472,7 @@ parts +=
cron-entry-rss cron-entry-rss
deploy-index deploy-index
deploy-logfile-cgi deploy-logfile-cgi
deploy-ressource-monitoring-cgi deploy-resource-monitoring-cgi
setup-static-files setup-static-files
public-symlink public-symlink
cgi-httpd-wrapper cgi-httpd-wrapper
......
stack/erp5/instance-http-monitor.cfg.in
View file @ 44cc3774
...@@ -8,7 +8,7 @@ parts = ...@@ -8,7 +8,7 @@ parts =
deploy-settings-cgi deploy-settings-cgi
deploy-status-cgi deploy-status-cgi
deploy-status-history-cgi deploy-status-history-cgi
deploy-ressource-monitoring-cgi deploy-resource-monitoring-cgi
setup-static-files setup-static-files
certificate-authority certificate-authority
zero-parameters zero-parameters
......
stack/monitor/buildout.cfg
View file @ 44cc3774
...@@ -100,12 +100,12 @@ md5sum = d2b85ac31cbbf49c78dc51e90ddf305f ...@@ -100,12 +100,12 @@ md5sum = d2b85ac31cbbf49c78dc51e90ddf305f
filename = logfile.cgi.in filename = logfile.cgi.in
mode = 0644 mode = 0644
[ressources-cgi] [resources-cgi]
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 = #md5sum =
filename = ressources.cgi.in filename = resources.cgi.in
mode = 0644 mode = 0644
[status-cgi] [status-cgi]
......
stack/monitor/monitor.cfg.in
View file @ 44cc3774
...@@ -196,11 +196,11 @@ context = ...@@ -196,11 +196,11 @@ context =
[log-folder-cgi] [log-folder-cgi]
log-folder = $${monitor-directory:log} log-folder = $${monitor-directory:log}
[deploy-ressource-monitoring-cgi] [deploy-resource-monitoring-cgi]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
template = ${ressources-cgi:location}/${ressources-cgi:filename} template = ${resources-cgi:location}/${resources-cgi:filename}
rendered = $${monitor-directory:monitoring-cgi}/$${:filename} rendered = $${monitor-directory:monitoring-cgi}/$${:filename}
filename = ressources.cgi filename = resources.cgi
mode = $${deploy-settings-cgi:mode} mode = $${deploy-settings-cgi:mode}
context = context =
key monitor_bin monitor-parameters:executable key monitor_bin monitor-parameters:executable
......
stack/monitor/webfile-directory/ressources.cgi.in → stack/monitor/webfile-directory/resources.cgi.in
View file @ 44cc3774
...@@ -92,7 +92,7 @@ $(document).ready(function () { ...@@ -92,7 +92,7 @@ $(document).ready(function () {
function refresh() { function refresh() {
if (send) { return} if (send) { return}
var dataPost = {'posting-script': "monitoring/ressources.cgi", var dataPost = {'posting-script': "monitoring/resources.cgi",
action: "refresh"}; action: "refresh"};
send = true; send = true;
$("#msg").fadeIn(); $("#msg").fadeIn();
...@@ -163,7 +163,7 @@ $(document).ready(function () { ...@@ -163,7 +163,7 @@ $(document).ready(function () {
}); });
</script> </script>
</head><body> </head><body>
<h1>Computer partition ressources monitoring</h1> <h1>Computer partition resources monitoring</h1>
<div style="width:850px; padding: 10px 0;"> <div style="width:850px; padding: 10px 0;">
<div style='float:left; width: 500px'> <div style='float:left; width: 500px'>
<table class="tg" id="box3"> <table class="tg" id="box3">
...@@ -181,7 +181,7 @@ $(document).ready(function () { ...@@ -181,7 +181,7 @@ $(document).ready(function () {
</div> </div>
</div> </div>
<div style='clear:both'></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"> <table class="tg" id="box2">
<tr> <tr>
<th class="tg-s6z2">Total Process</th> <th class="tg-s6z2">Total Process</th>
...@@ -192,7 +192,7 @@ $(document).ready(function () { ...@@ -192,7 +192,7 @@ $(document).ready(function () {
<th class="tg-s6z2">Memory %</th> <th class="tg-s6z2">Memory %</th>
</tr> </tr>
</table> </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"> <table class="tg" id="box1">
<tr> <tr>
<th class="tg-s6z2">Process PID</th> <th class="tg-s6z2">Process PID</th>
...@@ -204,4 +204,4 @@ $(document).ready(function () { ...@@ -204,4 +204,4 @@ $(document).ready(function () {
</tr> </tr>
</table> </table>
<p id="error"></p> <p id="error"></p>
</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