Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
18
Merge Requests
18
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos.core
Commits
c597decf
Commit
c597decf
authored
Apr 12, 2016
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_monitoring: minor changes
parent
2462c173
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
17 additions
and
394 deletions
+17
-394
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_appcache.xml
...mplateItem/web_page_module/gadget_monitoring_appcache.xml
+3
-3
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_header_js.js
...mplateItem/web_page_module/gadget_monitoring_header_js.js
+1
-3
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_header_js.xml
...plateItem/web_page_module/gadget_monitoring_header_js.xml
+2
-2
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_overview_js.html
...teItem/web_page_module/gadget_monitoring_overview_js.html
+0
-16
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_overview_js.xml
...ateItem/web_page_module/gadget_monitoring_overview_js.xml
+2
-2
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_status_list_js.html
...tem/web_page_module/gadget_monitoring_status_list_js.html
+0
-5
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_status_list_js.xml
...Item/web_page_module/gadget_monitoring_status_list_js.xml
+2
-2
master/bt5/slapos_monitoring/PathTemplateItem/web_site_module/monitoring_render_js/hateoas.xml
...lateItem/web_site_module/monitoring_render_js/hateoas.xml
+4
-4
master/bt5/slapos_monitoring/PathTemplateItem/web_site_module/monitoring_render_js/rjsunsafe.xml
...teItem/web_site_module/monitoring_render_js/rjsunsafe.xml
+0
-354
master/bt5/slapos_monitoring/bt/template_keep_last_workflow_history_only_path_list
...ing/bt/template_keep_last_workflow_history_only_path_list
+1
-1
master/bt5/slapos_monitoring/bt/template_keep_workflow_path_list
...bt5/slapos_monitoring/bt/template_keep_workflow_path_list
+1
-1
master/bt5/slapos_monitoring/bt/template_path_list
master/bt5/slapos_monitoring/bt/template_path_list
+1
-1
No files found.
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_appcache.xml
View file @
c597decf
...
@@ -107,7 +107,7 @@
...
@@ -107,7 +107,7 @@
<value>
<string
encoding=
"cdata"
>
<![CDATA[
<value>
<string
encoding=
"cdata"
>
<![CDATA[
CACHE MANIFEST\n
CACHE MANIFEST\n
# generated on Fri,
30 Mars
2016 11:45:33 +0000\n
# generated on Fri,
11 April
2016 11:45:33 +0000\n
# XXX + fonts\n
# XXX + fonts\n
# images/ajax-loader.gif\n
# images/ajax-loader.gif\n
CACHE:\n
CACHE:\n
...
@@ -326,7 +326,7 @@ NETWORK:\n
...
@@ -326,7 +326,7 @@ NETWORK:\n
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
950.
11734.46994.47240
</string>
</value>
<value>
<string>
950.
28768.11607.28996
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -344,7 +344,7 @@ NETWORK:\n
...
@@ -344,7 +344,7 @@ NETWORK:\n
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14
59356896.12
</float>
<float>
14
60450834.81
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_header_js.js
View file @
c597decf
...
@@ -135,9 +135,7 @@
...
@@ -135,9 +135,7 @@
[
'
edit_url
'
,
'
Edit
'
,
'
pencil
'
],
[
'
edit_url
'
,
'
Edit
'
,
'
pencil
'
],
[
'
add_url
'
,
'
Add
'
,
'
plus
'
],
[
'
add_url
'
,
'
Add
'
,
'
plus
'
],
[
'
new_url
'
,
'
New
'
,
'
plus
'
],
[
'
new_url
'
,
'
New
'
,
'
plus
'
],
[
'
refresh_url
'
,
'
Refresh
'
,
'
refresh
'
],
[
'
refresh_url
'
,
'
Refresh
'
,
'
refresh
'
]
[
'
display_grid
'
,
'
Change View
'
,
'
grid
'
],
[
'
display_list
'
,
'
Change View
'
,
'
bullets
'
]
],
],
possible_right_button_list
=
[
possible_right_button_list
=
[
[
'
save_action
'
,
'
Save
'
,
'
check
'
,
'
submit
'
],
[
'
save_action
'
,
'
Save
'
,
'
check
'
,
'
submit
'
],
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_header_js.xml
View file @
c597decf
...
@@ -235,7 +235,7 @@
...
@@ -235,7 +235,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
48.30482.37472.6331
</string>
</value>
<value>
<string>
9
50.28768.11607.28996
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -253,7 +253,7 @@
...
@@ -253,7 +253,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14
52873280.01
</float>
<float>
14
60450584.75
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_overview_js.html
View file @
c597decf
...
@@ -14,21 +14,6 @@
...
@@ -14,21 +14,6 @@
return gadget.getDeclaredGadget("listview")
return gadget.getDeclaredGadget("listview")
.push(function (listbox_gadget) {
.push(function (listbox_gadget) {
gadget.property_dict.listview = listbox_gadget;
gadget.property_dict.listview = listbox_gadget;
return gadget.getSetting('monitoring_display_filter');
})
.push(function (display_filter) {
gadget.property_dict.display_filter = display_filter || '';
});
})
.ready(function (gadget) {
return gadget.getSetting('jio_storage_description')
.push(function (jio_storage) {
if (! jio_storage) {
return gadget.redirect({
page: 'settings_configurator'
});
}
gadget.property_dict.listview_data_url = jio_storage.sub_storage.sub_storage.url;
});
});
})
})
.declareMethod('render', function (options) {
.declareMethod('render', function (options) {
...
@@ -45,7 +30,6 @@
...
@@ -45,7 +30,6 @@
title: 'Title'
title: 'Title'
},
},
data_id: 'monitor.global',
data_id: 'monitor.global',
data_url: gadget.property_dict.listview_data_url,
search_column_list: [
search_column_list: [
{select: 'status', title: 'Status'},
{select: 'status', title: 'Status'},
{select: 'hosting-title', title: 'Date'}
{select: 'hosting-title', title: 'Date'}
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_overview_js.xml
View file @
c597decf
...
@@ -239,7 +239,7 @@
...
@@ -239,7 +239,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
49.23937.2972.5563
</string>
</value>
<value>
<string>
9
50.28768.11607.28996
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -257,7 +257,7 @@
...
@@ -257,7 +257,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14
58226729.62
</float>
<float>
14
60450670.49
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_status_list_js.html
View file @
c597decf
...
@@ -71,11 +71,6 @@
...
@@ -71,11 +71,6 @@
}
}
};
};
if (gadget.property_dict.display_option == 'list') {
header.display_grid = '#page=main
&display=grid';
} else {
header.display_list = '#page=main
&display=list';
}
return gadget.updateHeader(header)
return gadget.updateHeader(header)
.push(function () {
.push(function () {
if (options.opml_url) {
if (options.opml_url) {
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_status_list_js.xml
View file @
c597decf
...
@@ -239,7 +239,7 @@
...
@@ -239,7 +239,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
49.58584.63587.19677
</string>
</value>
<value>
<string>
9
50.28768.11607.28996
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -257,7 +257,7 @@
...
@@ -257,7 +257,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14
58314108.86
</float>
<float>
14
60450783.19
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_site_module/monitoring_render_js/hateoas.xml
View file @
c597decf
...
@@ -261,11 +261,11 @@
...
@@ -261,11 +261,11 @@
</item>
</item>
<item>
<item>
<key>
<string>
skin_selection_name
</string>
</key>
<key>
<string>
skin_selection_name
</string>
</key>
<value>
<string>
Hal
Restricted
</string>
</value>
<value>
<string>
Hal
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
<value>
<string>
Restricted
Hateoas
</string>
</value>
<value>
<string>
Hateoas
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
view_action_category
</string>
</key>
<key>
<string>
view_action_category
</string>
</key>
...
@@ -434,7 +434,7 @@
...
@@ -434,7 +434,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
49.6675.61849.23210
</string>
</value>
<value>
<string>
9
50.29945.27881.11383
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -452,7 +452,7 @@
...
@@ -452,7 +452,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14
59762739.09
</float>
<float>
14
60450799.56
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_site_module/monitoring_render_js/rjsunsafe.xml
deleted
100644 → 0
View file @
2462c173
This diff is collapsed.
Click to expand it.
master/bt5/slapos_monitoring/bt/template_keep_last_workflow_history_only_path_list
View file @
c597decf
web_page_module/gadget_monitoring_*
web_page_module/gadget_monitoring_*
web_site_module/monitoring_render_js
web_site_module/monitoring_render_js
web_site_module/monitoring_render_js/
**
web_site_module/monitoring_render_js/
hateoas
web_page_module/gadget_erp5_graph_*
web_page_module/gadget_erp5_graph_*
web_page_module/jio_dev_rssfeed_storage_js
web_page_module/jio_dev_rssfeed_storage_js
web_page_module/chart_min_js
web_page_module/chart_min_js
...
...
master/bt5/slapos_monitoring/bt/template_keep_workflow_path_list
View file @
c597decf
web_page_module/gadget_monitoring_*
web_page_module/gadget_monitoring_*
web_site_module/monitoring_render_js
web_site_module/monitoring_render_js
web_site_module/monitoring_render_js/
**
web_site_module/monitoring_render_js/
hateoas
web_page_module/gadget_erp5_graph_*
web_page_module/gadget_erp5_graph_*
web_page_module/jio_dev_rssfeed_storage_js
web_page_module/jio_dev_rssfeed_storage_js
web_page_module/chart_min_js
web_page_module/chart_min_js
...
...
master/bt5/slapos_monitoring/bt/template_path_list
View file @
c597decf
...
@@ -7,4 +7,4 @@ web_page_module/jsen_json_validator_js
...
@@ -7,4 +7,4 @@ web_page_module/jsen_json_validator_js
web_page_module/magnific-popup.css
web_page_module/magnific-popup.css
web_page_module/rjs_dygraph_js
web_page_module/rjs_dygraph_js
web_site_module/monitoring_render_js
web_site_module/monitoring_render_js
web_site_module/monitoring_render_js/**
web_site_module/monitoring_render_js/hateoas
\ No newline at end of file
\ No newline at end of file
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