[erp5_web_monitoring] split graph display and allow to disable auto update

Show Ressource consumption graph into separated graphs. Auto update of graph content is disabled by default, a new option is added to enable if needed.

[erp5_web_monitoring] split graph display and allow to disable auto update
Show Ressource consumption graph into separated graphs. Auto update of graph content is disabled by default, a new option is added to enable if needed.
a21d1a10 · Alain Takoudjou · Rafael Monnerat · e4a938a8 · a21d1a10 · a21d1a10
Commit a21d1a10 authored Nov 14, 2018 by Alain Takoudjou Committed by Rafael Monnerat Sep 19, 2019
4 changed files
--- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_resources_view_html.html
+++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_resources_view_html.html
@@ -26,7 +26,6 @@

  <body>
    <div data-gadget-url="gadget_officejs_monitoring_jio.html" data-gadget-scope="jio_gadget" data-gadget-sandbox="public"></div>
-    <h2 class="header-notice"><i class="ui-icon ui-icon-custom ui-icon-info"></i> Graph content will be reloaded automatically every minutes.</h2>
    <!--<ul class="ui-grid-column ui-grid-column-5 graph_cpu">
      <li class="ui-grid-span-5 custom-grid-wrap graph-cell">
        <div data-gadget-url="gadget_erp5_graph.html" data-gadget-scope="graph_cpu" class="graph graph-h-medium" data-gadget-sandbox="public"></div>
@@ -36,13 +35,22 @@
      </li>
    </ul>-->
    <div class="ui-grid-a ui-responsive">
+      <form class="save_form ui-body-c" novalidate style="padding-left: 30px">
+        <div data-gadget-url="gadget_erp5_form.html"
+                data-gadget-scope="form_cpu_graph"
+                data-gadget-sandbox="public">
+        </div>
+      </form>
      <div data-gadget-url="gadget_field_graph_dygraph.html" data-gadget-scope="graph_cpu" class="graph graph-h-medium" data-gadget-sandbox="public"></div>
    </div>
-    <div class="ui-grid-b ui-responsive">
-      <div data-gadget-url="gadget_field_graph_dygraph.html" data-gadget-scope="graph_io" class="graph graph-h-medium" data-gadget-sandbox="public"></div>
-    </div>
    <div class="ui-grid-a ui-responsive">
      <div data-gadget-url="gadget_field_graph_dygraph.html" data-gadget-scope="graph_memory_used" class="graph graph-h-medium" data-gadget-sandbox="public"></div>
    </div>
+    <div class="ui-grid-a ui-responsive">
+      <div data-gadget-url="gadget_field_graph_dygraph.html" data-gadget-scope="graph_io_read" class="graph graph-h-medium" data-gadget-sandbox="public"></div>
+    </div>
+    <div class="ui-grid-a ui-responsive">
+      <div data-gadget-url="gadget_field_graph_dygraph.html" data-gadget-scope="graph_io_write" class="graph graph-h-medium" data-gadget-sandbox="public"></div>
+    </div>
  </body>
 </html>
--- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_resources_view_html.xml
+++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_resources_view_html.xml
@@ -246,7 +246,7 @@
            </item>
            <item>
                <key> <string>serial</string> </key>
-                <value> <string>963.22427.36654.49664</string> </value>
+                <value> <string>971.40737.38602.8192</string> </value>
            </item>
            <item>
                <key> <string>state</string> </key>
@@ -264,7 +264,7 @@
                    </tuple>
                    <state>
                      <tuple>
-                        <float>1510327355.11</float>
+                        <float>1542206472.63</float>
                        <string>UTC</string>
                      </tuple>
                    </state>

--- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_resources_view_js.js
+++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_resources_view_js.js
--- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_resources_view_js.xml
+++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_resources_view_js.xml
@@ -242,7 +242,7 @@
            </item>
            <item>
                <key> <string>serial</string> </key>
-                <value> <string>963.27984.14453.52343</string> </value>
+                <value> <string>971.40812.22256.57156</string> </value>
            </item>
            <item>
                <key> <string>state</string> </key>
@@ -260,7 +260,7 @@
                    </tuple>
                    <state>
                      <tuple>
-                        <float>1510651329.34</float>
+                        <float>1542208228.67</float>
                        <string>UTC</string>
                      </tuple>
                    </state>