Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos-caddy
Commits
44cc3774
Commit
44cc3774
authored
Feb 27, 2015
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix typos
ressource => resource
parent
9caeeebd
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
13 deletions
+13
-13
software/slapos-master/instance-balancer.cfg.in
software/slapos-master/instance-balancer.cfg.in
+1
-1
software/slapos-master/instance-zope.cfg.in
software/slapos-master/instance-zope.cfg.in
+1
-1
stack/erp5/instance-http-monitor.cfg.in
stack/erp5/instance-http-monitor.cfg.in
+1
-1
stack/monitor/buildout.cfg
stack/monitor/buildout.cfg
+2
-2
stack/monitor/monitor.cfg.in
stack/monitor/monitor.cfg.in
+3
-3
stack/monitor/webfile-directory/resources.cgi.in
stack/monitor/webfile-directory/resources.cgi.in
+5
-5
No files found.
software/slapos-master/instance-balancer.cfg.in
View file @
44cc3774
...
...
@@ -282,7 +282,7 @@ parts +=
cron-entry-rss
deploy-index
deploy-logfile-cgi
deploy-res
s
ource-monitoring-cgi
deploy-resource-monitoring-cgi
setup-static-files
public-symlink
cgi-httpd-wrapper
...
...
software/slapos-master/instance-zope.cfg.in
View file @
44cc3774
...
...
@@ -472,7 +472,7 @@ parts +=
cron-entry-rss
deploy-index
deploy-logfile-cgi
deploy-res
s
ource-monitoring-cgi
deploy-resource-monitoring-cgi
setup-static-files
public-symlink
cgi-httpd-wrapper
...
...
stack/erp5/instance-http-monitor.cfg.in
View file @
44cc3774
...
...
@@ -8,7 +8,7 @@ parts =
deploy-settings-cgi
deploy-status-cgi
deploy-status-history-cgi
deploy-res
s
ource-monitoring-cgi
deploy-resource-monitoring-cgi
setup-static-files
certificate-authority
zero-parameters
...
...
stack/monitor/buildout.cfg
View file @
44cc3774
...
...
@@ -100,12 +100,12 @@ md5sum = d2b85ac31cbbf49c78dc51e90ddf305f
filename = logfile.cgi.in
mode = 0644
[res
s
ources-cgi]
[resources-cgi]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/webfile-directory/${:filename}
download-only = true
#md5sum =
filename = res
s
ources.cgi.in
filename = resources.cgi.in
mode = 0644
[status-cgi]
...
...
stack/monitor/monitor.cfg.in
View file @
44cc3774
...
...
@@ -196,11 +196,11 @@ context =
[log-folder-cgi]
log-folder = $${monitor-directory:log}
[deploy-res
s
ource-monitoring-cgi]
[deploy-resource-monitoring-cgi]
recipe = slapos.recipe.template:jinja2
template = ${res
sources-cgi:location}/${res
sources-cgi:filename}
template = ${res
ources-cgi:location}/${re
sources-cgi:filename}
rendered = $${monitor-directory:monitoring-cgi}/$${:filename}
filename = res
s
ources.cgi
filename = resources.cgi
mode = $${deploy-settings-cgi:mode}
context =
key monitor_bin monitor-parameters:executable
...
...
stack/monitor/webfile-directory/res
s
ources.cgi.in
→
stack/monitor/webfile-directory/resources.cgi.in
View file @
44cc3774
...
...
@@ -92,7 +92,7 @@ $(document).ready(function () {
function
refresh
()
{
if
(
send
)
{
return
}
var
dataPost
=
{
'
posting-script
'
:
"
monitoring/res
s
ources.cgi
"
,
var
dataPost
=
{
'
posting-script
'
:
"
monitoring/resources.cgi
"
,
action
:
"
refresh
"
};
send
=
true
;
$
(
"
#msg
"
).
fadeIn
();
...
...
@@ -163,7 +163,7 @@ $(document).ready(function () {
});
</script>
</head><body>
<h1>
Computer partition res
s
ources 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 res
s
ources 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>
res
s
ources 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>
"""
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment