Ready for Glances 3.0

6 files changed, 91 insertions, 21 deletions

diff --git a/NEWS b/NEWS
index 257dc204..30bc9cf5 100644
--- a/NEWS
+++ b/NEWS
@@ -10,14 +10,13 @@ Enhancements and new features:
     * Make the left side bar width dynamic in the Curse UI #1177
     * Add threads number in the process list #1259
     * A way to have only REST API available and disable WEB GUI access #1149
-    * Replace Matplolib by Pygal #697
+    * Refactor graph export plugin (& replace Matplolib by Pygal) #697
     * Docker module doesn't export details about stopped containers #1152
     * Add dynamic fields in all sections of the configuration file #1204
-    * Make plugins disable and export CLI option dynamical #1173
+    * Make plugins and export CLI option dynamical #1173
     * Add a light mode for the console UI #1165
     * Refactor InfluxDB (API is now stable) #1166
     * Add deflate compression support to the RestAPI #1182
-    * Remove graph export from Glances #1206
     * Add a code of conduct for Glances project's participants #1211
     * Context switches bottleneck identification #1212
     * Take advantage of the psutil issue #1025 (Add process_iter(attrs, ad_value)) #1105
@@ -26,7 +25,7 @@ Enhancements and new features:
     * Add a new output mode to stdout #1168
     * Huge refactor of the WebUI packaging thanks to @spike008t #1239
     * Add time zone to the current time #1249
-    * Use https URLs for checking external IP #1253
+    * Use HTTPs URLs to check public IP address #1253
     * Add labels support to Promotheus exporter #1255
     * Overlap in Web UI when monitoring a machine with 16 cpu threads #1265
     * Support for exporting data to a MQTT server #1305
diff --git a/conf/glances-grafana.json b/conf/glances-grafana.json
index d903e32b..0156140f 100644
--- a/conf/glances-grafana.json
+++ b/conf/glances-grafana.json
@@ -895,7 +895,7 @@
       "seriesOverrides": [
         {
           "alias": "Tx",
-          "yaxis": 2
+          "yaxis": 1
         }
       ],
       "spaceLength": 10,
@@ -903,7 +903,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "alias": "Rx",
+          "alias": "In",
           "column": "enp0s25.rx",
           "dsType": "influxdb",
           "function": "mean",
@@ -947,7 +947,7 @@
           "tags": []
         },
         {
-          "alias": "Tx",
+          "alias": "Out",
           "column": "eth0.tx*-1",
           "dsType": "influxdb",
           "function": "mean",
@@ -968,7 +968,7 @@
           "measurement": "localhost.network",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT mean(\"$interface.tx\")/mean(\"$interface.time_since_update\")*8 FROM \"localhost.network\" WHERE $timeFilter GROUP BY time($interval) fill(none)",
+          "query": "SELECT mean(\"$interface.tx\")/mean(\"$interface.time_since_update\")*8*-1 FROM \"localhost.network\" WHERE $timeFilter GROUP BY time($interval) fill(none)",
           "rawQuery": true,
           "refId": "B",
           "resultFormat": "time_series",
@@ -1211,7 +1211,12 @@
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [],
+      "seriesOverrides": [
+        {
+          "alias": "Write",
+          "yaxis": 2
+        }
+      ],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
@@ -1367,14 +1372,19 @@
         "values": false
       },
       "lines": true,
-      "linewidth": 1,
+      "linewidth": 3,
       "links": [],
       "nullPointMode": "null",
       "percentage": false,
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [],
+      "seriesOverrides": [
+        {
+          "alias": "Used",
+          "fill": 10
+        }
+      ],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
@@ -1738,13 +1748,15 @@
     },
     {
       "aliasColors": {
+        "CPU%": "#cca300",
+        "MEM": "#2f575e",
         "localhost.docker.mean": "#ba43a9"
       },
       "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": "${DS_GLANCES}",
-      "fill": 1,
+      "fill": 0,
       "gridPos": {
         "h": 8,
         "w": 24,
@@ -1757,12 +1769,12 @@
         "current": false,
         "max": false,
         "min": false,
-        "show": false,
+        "show": true,
         "total": false,
         "values": false
       },
       "lines": true,
-      "linewidth": 1,
+      "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
       "percentage": false,
@@ -1771,12 +1783,28 @@
       "renderer": "flot",
       "repeat": "container",
       "repeatDirection": "v",
-      "seriesOverrides": [],
+      "seriesOverrides": [
+        {
+          "alias": "localhost.docker.mean",
+          "fill": 0
+        },
+        {
+          "alias": "MEM",
+          "yaxis": 2
+        },
+        {
+          "alias": "MEM",
+          "fill": 10,
+          "steppedLine": true,
+          "zindex": -3
+        }
+      ],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
+          "alias": "CPU%",
           "groupBy": [
             {
               "params": [
@@ -1814,6 +1842,44 @@
             ]
           ],
           "tags": []
+        },
+        {
+          "alias": "MEM",
+          "groupBy": [
+            {
+              "params": [
+                "$__interval"
+              ],
+              "type": "time"
+            },
+            {
+              "params": [
+                "null"
+              ],
+              "type": "fill"
+            }
+          ],
+          "orderByTime": "ASC",
+          "policy": "default",
+          "query": "SELECT mean(\"$container.memory_usage\") FROM \"localhost.docker\" WHERE $timeFilter GROUP BY time($__interval) fill(none)",
+          "rawQuery": true,
+          "refId": "B",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "value"
+                ],
+                "type": "field"
+              },
+              {
+                "params": [],
+                "type": "mean"
+              }
+            ]
+          ],
+          "tags": []
         }
       ],
       "thresholds": [],
@@ -2990,7 +3056,7 @@
       "yBucketSize": null
     }
   ],
-  "refresh": false,
+  "refresh": "5s",
   "schemaVersion": 16,
   "style": "dark",
   "tags": [],
@@ -3114,7 +3180,7 @@
     "type": "timepicker"
   },
   "timezone": "browser",
-  "title": "Glances_20180117",
+  "title": "Glances",
   "uid": "000000002",
-  "version": 6
+  "version": 10
 }
\ No newline at end of file
diff --git a/docs/_static/grafana.png b/docs/_static/grafana.png
index 4be55656..46ebf45f 100644
--- a/docs/_static/grafana.png
+++ b/docs/_static/grafana.png
diff --git a/docs/man/glances.1 b/docs/man/glances.1
index 748ccb08..631b8979 100644
--- a/docs/man/glances.1
+++ b/docs/man/glances.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "GLANCES" "1" "Aug 16, 2018" "3.0.rc5" "Glances"
+.TH "GLANCES" "1" "Sep 01, 2018" "3.0" "Glances"
 .SH NAME
 glances \- An eye on your system
 .
@@ -786,6 +786,9 @@ $ glances
 .UNINDENT
 .UNINDENT
 .sp
+Note: The standalone mode is not available on Microsoft Windows (c).
+Glances will start in Web server mode on this operating system.
+.sp
 Monitor local machine with the web interface (Web UI):
 .INDENT 0.0
 .INDENT 3.5
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 32bc9b40..725863a9 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -24,7 +24,7 @@ Glances should start (press 'q' or 'ESC' to exit):
 
 .. image:: _static/screenshot-wide.png
 
-It is also possible to display stats directly to stdout using:
+It is also possible to display RAW JSON stats directly to stdout using:
 
 .. code-block:: console
 
@@ -37,6 +37,8 @@ It is also possible to display stats directly to stdout using:
     load: {'cpucore': 4, 'min1': 0.19, 'min5': 0.39, 'min15': 0.27}
     ...
 
+Note: It will display one line per stat per refresh.
+
 Client/Server Mode
 ------------------
 
diff --git a/glances/__init__.py b/glances/__init__.py
index 1e31e2e0..d327e14b 100644
--- a/glances/__init__.py
+++ b/glances/__init__.py
@@ -27,7 +27,7 @@ import signal
 import sys
 
 # Global name
-__version__ = '3.0.rc5'
+__version__ = '3.0'
 __author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
 __license__ = 'LGPLv3'