Skip to content

S
slapos.core
Commit c597decf authored by Alain Takoudjou's avatar Alain Takoudjou
Browse files
Options

slapos_monitoring: minor changes

parent 2462c173
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 394 deletions
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>1459356896.12</float> <float>1460450834.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>948.30482.37472.6331</string> </value> <value> <string>950.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>1452873280.01</float> <float>1460450584.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>949.23937.2972.5563</string> </value> <value> <string>950.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>1458226729.62</float> <float>1460450670.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>949.58584.63587.19677</string> </value> <value> <string>950.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>1458314108.86</float> <float>1460450783.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>HalRestricted</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>949.6675.61849.23210</string> </value> <value> <string>950.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>1459762739.09</float> <float>1460450799.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
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Web Section" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_folders_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Copy_or_Move_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>__before_publishing_traverse__</string> </key>
<value>
<object>
<klass>
<global name="MultiHook" module="ZPublisher.BeforeTraverse"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_defined_in_class</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>_hookname</string> </key>
<value> <string>__before_publishing_traverse__</string> </value>
</item>
<item>
<key> <string>_list</string> </key>
<value>
<list>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</list>
</value>
</item>
<item>
<key> <string>_prior</string> </key>
<value>
<none/>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>__before_traverse__</string> </key>
<value>
<dictionary>
<item>
<key>
<tuple>
<int>99</int>
<string>ERP5 Web Section/rjsunsafe</string>
</tuple>
</key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>__translation_dict</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>_identity_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_range_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>empty_criterion_valid</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>rjsunsafe</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Web Section</string> </value>
</item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>skin_selection_name</string> </key>
<value> <string>RJSUnsafe</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>RJS Unsafe</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>workflow_history</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="WebSectionTraversalHook" module="Products.ERP5.Document.WebSection"/>
</pickle>
<pickle>
<dictionary/>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="5" aka="AAAAAAAAAAU=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>category_publication_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
</value>
</item>
<item>
<key> <string>edit_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="6" aka="AAAAAAAAAAY=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1451381945.07</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>validation_state</string> </key>
<value> <string>embedded</string> </value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
<record id="7" aka="AAAAAAAAAAc=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>949.6675.61849.23210</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1459762739.09</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
</ZopeData>
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
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