You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2021/01/07 04:51:21 UTC

[james-project] branch master updated: JAMES-3476 improve documentation

This is an automated email from the ASF dual-hosted git repository.

rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git


The following commit(s) were added to refs/heads/master by this push:
     new c2069a7  JAMES-3476 improve documentation
c2069a7 is described below

commit c2069a78623239b045367ec866e164e4ae564c47
Author: Juhan Aasaru <Ju...@nortal.com>
AuthorDate: Fri Dec 11 12:41:16 2020 +0200

    JAMES-3476 improve documentation
---
 .../BlobStore-1543222647953-dashboard.json         |  6 +--
 .../CacheBlobStore-15911761170000-dashboard.json   |  4 +-
 .../Cassandra_driver-1504068385404-dashboard.json  |  6 +--
 ...letedMessagesVault-1563771591074-dashboard.json |  6 +--
 .../IMAP_board-1488774825351-dashboard.json        | 46 ++++++++++----------
 .../IMAP_count_board-1488774815587-dashboard.json  |  6 +--
 ...AMES_DNS_dashboard-1491268903944-dashboard.json |  6 +--
 .../JMAP_board-1488774804236-dashboard.json        | 50 +++++++++++-----------
 .../JMAP_count_board-1488774795514-dashboard.json  |  6 +--
 .../James_JVM-1504068360629-dashboard.json         |  6 +--
 .../MAILET-1490071694187-dashboard.json            |  6 +--
 .../MATCHER-1490071813409-dashboard.json           |  6 +--
 .../MailQueue-1490071879988-dashboard.json         |  6 +--
 .../MailboxListeners rate-1552903378376.json       |  6 +--
 .../MailboxListeners-1528958667486-dashboard.json  |  6 +--
 .../MessageFastViewProjection-1575520507952.json   |  6 +--
 .../Miscalleneous-1490072265151-dashboard.json     |  6 +--
 .../PreDeletionHooks-1553684324244-dashboard.json  |  4 +-
 grafana-reporting/README.md                        | 43 +++++++++++++++++--
 .../SMTP_board-1488774774172-dashboard.json        | 20 ++++-----
 .../SMTP_count_board-1488774761350-dashboard.json  |  6 +--
 .../SpamAssassin-1522226824255-dashboard.json      |  6 +--
 .../Tika-1522226794419-dashboard.json              |  6 +--
 23 files changed, 152 insertions(+), 117 deletions(-)

diff --git a/grafana-reporting/BlobStore-1543222647953-dashboard.json b/grafana-reporting/BlobStore-1543222647953-dashboard.json
index 431d423..bd6080e 100644
--- a/grafana-reporting/BlobStore-1543222647953-dashboard.json
+++ b/grafana-reporting/BlobStore-1543222647953-dashboard.json
@@ -2,7 +2,7 @@
   "__inputs": [
     {
       "name": "DS_JAMES_ES",
-      "label": "james es",
+      "label": "James Elasticsearch",
       "description": "",
       "type": "datasource",
       "pluginId": "elasticsearch",
@@ -789,7 +789,7 @@
   "refresh": false,
   "schemaVersion": 16,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -826,4 +826,4 @@
   "title": "BlobStore",
   "uid": "Pnx8vOYiz",
   "version": 10
-}
\ No newline at end of file
+}
diff --git a/grafana-reporting/CacheBlobStore-15911761170000-dashboard.json b/grafana-reporting/CacheBlobStore-15911761170000-dashboard.json
index d7c3493..3ce24fd 100644
--- a/grafana-reporting/CacheBlobStore-15911761170000-dashboard.json
+++ b/grafana-reporting/CacheBlobStore-15911761170000-dashboard.json
@@ -491,7 +491,7 @@
   "refresh": "10s",
   "schemaVersion": 25,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -516,4 +516,4 @@
   "title": "CachedBlobstore",
   "uid": "XbLcT6zMz",
   "version": 4
-}
\ No newline at end of file
+}
diff --git a/grafana-reporting/Cassandra_driver-1504068385404-dashboard.json b/grafana-reporting/Cassandra_driver-1504068385404-dashboard.json
index bdb7ec4..bbf0747 100644
--- a/grafana-reporting/Cassandra_driver-1504068385404-dashboard.json
+++ b/grafana-reporting/Cassandra_driver-1504068385404-dashboard.json
@@ -2,7 +2,7 @@
   "__inputs": [
     {
       "name": "DS_JAMES_ES",
-      "label": "james es",
+      "label": "James Elasticsearch",
       "description": "",
       "type": "datasource",
       "pluginId": "elasticsearch",
@@ -710,7 +710,7 @@
   ],
   "schemaVersion": 14,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -746,4 +746,4 @@
   "timezone": "browser",
   "title": "Cassandra driver",
   "version": 6
-}
\ No newline at end of file
+}
diff --git a/grafana-reporting/DeletedMessagesVault-1563771591074-dashboard.json b/grafana-reporting/DeletedMessagesVault-1563771591074-dashboard.json
index 21e4617..6267270 100644
--- a/grafana-reporting/DeletedMessagesVault-1563771591074-dashboard.json
+++ b/grafana-reporting/DeletedMessagesVault-1563771591074-dashboard.json
@@ -2,7 +2,7 @@
   "__inputs": [
     {
       "name": "DS_JAMES_ES",
-      "label": "james es",
+      "label": "James Elasticsearch",
       "description": "",
       "type": "datasource",
       "pluginId": "elasticsearch",
@@ -662,7 +662,7 @@
   "refresh": false,
   "schemaVersion": 16,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -699,4 +699,4 @@
   "title": "DeletedMessagesVault",
   "uid": "_IgwshHWz",
   "version": 8
-}
\ No newline at end of file
+}
diff --git a/grafana-reporting/IMAP_board-1488774825351-dashboard.json b/grafana-reporting/IMAP_board-1488774825351-dashboard.json
index 99ec5dc..d8c7050 100644
--- a/grafana-reporting/IMAP_board-1488774825351-dashboard.json
+++ b/grafana-reporting/IMAP_board-1488774825351-dashboard.json
@@ -1,8 +1,8 @@
 {
   "__inputs": [
     {
-      "name": "DS_ELASTICSEARCH",
-      "label": "ElasticSearch",
+      "name": "DS_JAMES_ES",
+      "label": "James Elasticsearch",
       "description": "",
       "type": "datasource",
       "pluginId": "elasticsearch",
@@ -47,7 +47,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 8,
           "legend": {
@@ -140,7 +140,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 7,
           "legend": {
@@ -253,7 +253,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 2,
           "legend": {
@@ -366,7 +366,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 6,
           "legend": {
@@ -491,7 +491,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 10,
           "legend": {
@@ -604,7 +604,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 11,
           "legend": {
@@ -717,7 +717,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 16,
           "legend": {
@@ -830,7 +830,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 21,
           "legend": {
@@ -955,7 +955,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 13,
           "legend": {
@@ -1068,7 +1068,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 14,
           "legend": {
@@ -1181,7 +1181,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 15,
           "legend": {
@@ -1294,7 +1294,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 20,
           "legend": {
@@ -1419,7 +1419,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 9,
           "legend": {
@@ -1532,7 +1532,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 17,
           "legend": {
@@ -1645,7 +1645,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 18,
           "legend": {
@@ -1758,7 +1758,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 19,
           "legend": {
@@ -1883,7 +1883,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 22,
           "legend": {
@@ -1996,7 +1996,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 23,
           "legend": {
@@ -2109,7 +2109,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 24,
           "legend": {
@@ -2230,7 +2230,7 @@
   ],
   "schemaVersion": 14,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -2266,4 +2266,4 @@
   "timezone": "browser",
   "title": "IMAP board",
   "version": 7
-}
\ No newline at end of file
+}
diff --git a/grafana-reporting/IMAP_count_board-1488774815587-dashboard.json b/grafana-reporting/IMAP_count_board-1488774815587-dashboard.json
index 6e4d94f..22cdc65 100644
--- a/grafana-reporting/IMAP_count_board-1488774815587-dashboard.json
+++ b/grafana-reporting/IMAP_count_board-1488774815587-dashboard.json
@@ -2,7 +2,7 @@
   "__inputs": [
     {
       "name": "DS_JAMES_ES",
-      "label": "james es",
+      "label": "James Elasticsearch",
       "description": "",
       "type": "datasource",
       "pluginId": "elasticsearch",
@@ -2086,7 +2086,7 @@
   ],
   "schemaVersion": 14,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -2122,4 +2122,4 @@
   "timezone": "browser",
   "title": "IMAP count board",
   "version": 4
-}
\ No newline at end of file
+}
diff --git a/grafana-reporting/JAMES_DNS_dashboard-1491268903944-dashboard.json b/grafana-reporting/JAMES_DNS_dashboard-1491268903944-dashboard.json
index 34526c3..137f969 100644
--- a/grafana-reporting/JAMES_DNS_dashboard-1491268903944-dashboard.json
+++ b/grafana-reporting/JAMES_DNS_dashboard-1491268903944-dashboard.json
@@ -2,7 +2,7 @@
   "__inputs": [
     {
       "name": "DS_JAMES_ES",
-      "label": "james es",
+      "label": "James Elasticsearch",
       "description": "",
       "type": "datasource",
       "pluginId": "elasticsearch",
@@ -1205,7 +1205,7 @@
   ],
   "schemaVersion": 14,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -1241,4 +1241,4 @@
   "timezone": "browser",
   "title": "JAMES DNS dashboard",
   "version": 8
-}
\ No newline at end of file
+}
diff --git a/grafana-reporting/JMAP_board-1488774804236-dashboard.json b/grafana-reporting/JMAP_board-1488774804236-dashboard.json
index b90a657..d2cce3f 100644
--- a/grafana-reporting/JMAP_board-1488774804236-dashboard.json
+++ b/grafana-reporting/JMAP_board-1488774804236-dashboard.json
@@ -1,8 +1,8 @@
 {
   "__inputs": [
     {
-      "name": "DS_ELASTICSEARCH",
-      "label": "ElasticSearch",
+      "name": "DS_JAMES_ES",
+      "label": "James Elasticsearch",
       "description": "",
       "type": "datasource",
       "pluginId": "elasticsearch",
@@ -47,7 +47,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 23,
           "legend": {
@@ -160,7 +160,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 2,
           "legend": {
@@ -273,7 +273,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 11,
           "legend": {
@@ -386,7 +386,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 21,
           "legend": {
@@ -511,7 +511,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 10,
           "legend": {
@@ -624,7 +624,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 6,
           "legend": {
@@ -737,7 +737,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 16,
           "legend": {
@@ -850,7 +850,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 7,
           "legend": {
@@ -975,7 +975,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 13,
           "legend": {
@@ -1088,7 +1088,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 14,
           "legend": {
@@ -1201,7 +1201,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 15,
           "legend": {
@@ -1314,7 +1314,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 20,
           "legend": {
@@ -1439,7 +1439,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 9,
           "legend": {
@@ -1552,7 +1552,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 17,
           "legend": {
@@ -1665,7 +1665,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 24,
           "legend": {
@@ -1778,7 +1778,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 25,
           "legend": {
@@ -1903,7 +1903,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 22,
           "legend": {
@@ -2016,7 +2016,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 18,
           "legend": {
@@ -2129,7 +2129,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 19,
           "legend": {
@@ -2242,7 +2242,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 26,
           "legend": {
@@ -2367,7 +2367,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 27,
           "legend": {
@@ -2488,7 +2488,7 @@
   ],
   "schemaVersion": 14,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -2524,4 +2524,4 @@
   "timezone": "browser",
   "title": "JMAP board",
   "version": 1
-}
\ No newline at end of file
+}
diff --git a/grafana-reporting/JMAP_count_board-1488774795514-dashboard.json b/grafana-reporting/JMAP_count_board-1488774795514-dashboard.json
index 4c118f1..c10cfde 100644
--- a/grafana-reporting/JMAP_count_board-1488774795514-dashboard.json
+++ b/grafana-reporting/JMAP_count_board-1488774795514-dashboard.json
@@ -2,7 +2,7 @@
   "__inputs": [
     {
       "name": "DS_JAMES_ES",
-      "label": "james es",
+      "label": "James Elasticsearch",
       "description": "",
       "type": "datasource",
       "pluginId": "elasticsearch",
@@ -1399,7 +1399,7 @@
   ],
   "schemaVersion": 14,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -1435,4 +1435,4 @@
   "timezone": "browser",
   "title": "JMAP count board",
   "version": 7
-}
\ No newline at end of file
+}
diff --git a/grafana-reporting/James_JVM-1504068360629-dashboard.json b/grafana-reporting/James_JVM-1504068360629-dashboard.json
index 75979f4..2991832 100644
--- a/grafana-reporting/James_JVM-1504068360629-dashboard.json
+++ b/grafana-reporting/James_JVM-1504068360629-dashboard.json
@@ -2,7 +2,7 @@
   "__inputs": [
     {
       "name": "DS_JAMES_ES",
-      "label": "james es",
+      "label": "James Elasticsearch",
       "description": "",
       "type": "datasource",
       "pluginId": "elasticsearch",
@@ -1112,7 +1112,7 @@
   ],
   "schemaVersion": 14,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -1148,4 +1148,4 @@
   "timezone": "browser",
   "title": "James JVM",
   "version": 12
-}
\ No newline at end of file
+}
diff --git a/grafana-reporting/MAILET-1490071694187-dashboard.json b/grafana-reporting/MAILET-1490071694187-dashboard.json
index 0be1142..f7f309c 100644
--- a/grafana-reporting/MAILET-1490071694187-dashboard.json
+++ b/grafana-reporting/MAILET-1490071694187-dashboard.json
@@ -2,7 +2,7 @@
   "__inputs": [
     {
       "name": "DS_JAMES_ES",
-      "label": "james es",
+      "label": "James Elasticsearch",
       "description": "",
       "type": "datasource",
       "pluginId": "elasticsearch",
@@ -2250,7 +2250,7 @@
   ],
   "schemaVersion": 14,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -2286,4 +2286,4 @@
   "timezone": "browser",
   "title": "MAILET",
   "version": 23
-}
\ No newline at end of file
+}
diff --git a/grafana-reporting/MATCHER-1490071813409-dashboard.json b/grafana-reporting/MATCHER-1490071813409-dashboard.json
index b948e4e..65d601d 100644
--- a/grafana-reporting/MATCHER-1490071813409-dashboard.json
+++ b/grafana-reporting/MATCHER-1490071813409-dashboard.json
@@ -2,7 +2,7 @@
   "__inputs": [
     {
       "name": "DS_JAMES_ES",
-      "label": "james es",
+      "label": "James Elasticsearch",
       "description": "",
       "type": "datasource",
       "pluginId": "elasticsearch",
@@ -632,7 +632,7 @@
   ],
   "schemaVersion": 14,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -668,4 +668,4 @@
   "timezone": "browser",
   "title": "MATCHER",
   "version": 6
-}
\ No newline at end of file
+}
diff --git a/grafana-reporting/MailQueue-1490071879988-dashboard.json b/grafana-reporting/MailQueue-1490071879988-dashboard.json
index 56b9f1c..d469345 100644
--- a/grafana-reporting/MailQueue-1490071879988-dashboard.json
+++ b/grafana-reporting/MailQueue-1490071879988-dashboard.json
@@ -2,7 +2,7 @@
   "__inputs": [
     {
       "name": "DS_JAMES_ES",
-      "label": "james es",
+      "label": "James Elasticsearch",
       "description": "",
       "type": "datasource",
       "pluginId": "elasticsearch",
@@ -1048,7 +1048,7 @@
   ],
   "schemaVersion": 14,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -1084,4 +1084,4 @@
   "timezone": "browser",
   "title": "MailQueue",
   "version": 26
-}
\ No newline at end of file
+}
diff --git a/grafana-reporting/MailboxListeners rate-1552903378376.json b/grafana-reporting/MailboxListeners rate-1552903378376.json
index ece9c76..69a29a6 100644
--- a/grafana-reporting/MailboxListeners rate-1552903378376.json	
+++ b/grafana-reporting/MailboxListeners rate-1552903378376.json	
@@ -2,7 +2,7 @@
   "__inputs": [
     {
       "name": "DS_JAMES_ES",
-      "label": "james es",
+      "label": "James Elasticsearch",
       "description": "",
       "type": "datasource",
       "pluginId": "elasticsearch",
@@ -794,7 +794,7 @@
   "refresh": false,
   "schemaVersion": 18,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -831,4 +831,4 @@
   "title": "MailboxListeners rate",
   "uid": "EM-tudqik",
   "version": 3
-}
\ No newline at end of file
+}
diff --git a/grafana-reporting/MailboxListeners-1528958667486-dashboard.json b/grafana-reporting/MailboxListeners-1528958667486-dashboard.json
index 017059d..a8c77fe 100644
--- a/grafana-reporting/MailboxListeners-1528958667486-dashboard.json
+++ b/grafana-reporting/MailboxListeners-1528958667486-dashboard.json
@@ -2,7 +2,7 @@
   "__inputs": [
     {
       "name": "DS_JAMES_ES",
-      "label": "james es",
+      "label": "James Elasticsearch",
       "description": "",
       "type": "datasource",
       "pluginId": "elasticsearch",
@@ -745,7 +745,7 @@
   ],
   "schemaVersion": 14,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -781,4 +781,4 @@
   "timezone": "browser",
   "title": "MailboxListeners",
   "version": 6
-}
\ No newline at end of file
+}
diff --git a/grafana-reporting/MessageFastViewProjection-1575520507952.json b/grafana-reporting/MessageFastViewProjection-1575520507952.json
index 86bdd2d..6011195 100644
--- a/grafana-reporting/MessageFastViewProjection-1575520507952.json
+++ b/grafana-reporting/MessageFastViewProjection-1575520507952.json
@@ -2,7 +2,7 @@
   "__inputs": [
     {
       "name": "DS_JAMES_ES",
-      "label": "james es",
+      "label": "James Elasticsearch",
       "description": "",
       "type": "datasource",
       "pluginId": "elasticsearch",
@@ -396,7 +396,7 @@
   "refresh": false,
   "schemaVersion": 16,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -433,4 +433,4 @@
   "title": "MessageFastViewProjection",
   "uid": "Ia1Nu5aWk",
   "version": 21
-}
\ No newline at end of file
+}
diff --git a/grafana-reporting/Miscalleneous-1490072265151-dashboard.json b/grafana-reporting/Miscalleneous-1490072265151-dashboard.json
index 8c9e33d..8581b5b 100644
--- a/grafana-reporting/Miscalleneous-1490072265151-dashboard.json
+++ b/grafana-reporting/Miscalleneous-1490072265151-dashboard.json
@@ -2,7 +2,7 @@
   "__inputs": [
     {
       "name": "DS_JAMES_ES",
-      "label": "james es",
+      "label": "James Elasticsearch",
       "description": "",
       "type": "datasource",
       "pluginId": "elasticsearch",
@@ -1612,7 +1612,7 @@
   ],
   "schemaVersion": 14,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -1648,4 +1648,4 @@
   "timezone": "browser",
   "title": "Miscalleneous",
   "version": 4
-}
\ No newline at end of file
+}
diff --git a/grafana-reporting/PreDeletionHooks-1553684324244-dashboard.json b/grafana-reporting/PreDeletionHooks-1553684324244-dashboard.json
index f0b2987..3044105 100644
--- a/grafana-reporting/PreDeletionHooks-1553684324244-dashboard.json
+++ b/grafana-reporting/PreDeletionHooks-1553684324244-dashboard.json
@@ -147,7 +147,7 @@
   "refresh": false,
   "schemaVersion": 18,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -184,4 +184,4 @@
   "title": "PreDeletionHooks",
   "uid": "ntIRCz6mk",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/grafana-reporting/README.md b/grafana-reporting/README.md
index 8af1c39..e275948 100644
--- a/grafana-reporting/README.md
+++ b/grafana-reporting/README.md
@@ -1,14 +1,23 @@
 # Grafana reporting
 
+This is a collection of Grafana dashboards to display James metrics.
+
+## Run Grafana 
+
 The following command allow you to run a fresh grafana server :
 
 ```
 docker run -i -p 3000:3000 grafana/grafana
 ```
 
-Once running, you need to set up an ElasticSearch data-source :
+## Configure a data source
+Once running, you need to set up an [ElasticSearch data-source](https://grafana.com/docs/grafana/latest/datasources/elasticsearch/).
+You can do this either from UI or from a configuration file.
+
+## Setting up via UI
+ - name it DS_JAMES_ES
  - select proxy mode
- - Select version 2.x of ElasticSearch
+ - Select version 6.x of ElasticSearch
  - make the URL point your ES node
  - Specify the index name. By default, it should be :
 
@@ -16,9 +25,35 @@ Once running, you need to set up an ElasticSearch data-source :
 [james-metrics-]YYYY-MM
 ```
 
-Import the different dashboards in this directory.
+## Setting up using a configuration file
+
+Look up file grafana-datasource.yaml from Grafana and add following data source into it:
+
+```
+apiVersion: 1
+
+datasources:
+  - name: DS_JAMES_ES
+    type: elasticsearch
+    access: proxy
+    database: "[james-metrics-]YYYY-MM"
+    url: http://elasticsearch:9200
+    version: 6
+    editable: true
+    jsonData:
+      interval: Daily
+      timeField: "@timestamp"
+```
+
+## Getting dashboards
+
+Import the different dashboard JSON files in this directory to Grafana via UI
+or paste the files into Grafana dashboards folder (/var/lib/grafana/dashboards by default) 
+
+## Enable reporting from James configuration
 
-You then need to enable reporting through ElasticSearch. Modify your James ElasticSearch configuration file accordingly.
+You then need to enable James to report its stats into ElasticSearch.
+Modify your James ElasticSearch configuration file accordingly.
 To help you doing this, you can take a look to [GitHub](https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties).
 Note that you need to run a guice version of James.
 
diff --git a/grafana-reporting/SMTP_board-1488774774172-dashboard.json b/grafana-reporting/SMTP_board-1488774774172-dashboard.json
index 459e6c2..352c2f2 100644
--- a/grafana-reporting/SMTP_board-1488774774172-dashboard.json
+++ b/grafana-reporting/SMTP_board-1488774774172-dashboard.json
@@ -1,8 +1,8 @@
 {
   "__inputs": [
     {
-      "name": "DS_ELASTICSEARCH",
-      "label": "ElasticSearch",
+      "name": "DS_JAMES_ES",
+      "label": "James Elasticsearch",
       "description": "",
       "type": "datasource",
       "pluginId": "elasticsearch",
@@ -47,7 +47,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 8,
           "legend": {
@@ -140,7 +140,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 7,
           "legend": {
@@ -265,7 +265,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 10,
           "legend": {
@@ -378,7 +378,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 11,
           "legend": {
@@ -503,7 +503,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 2,
           "legend": {
@@ -616,7 +616,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_ELASTICSEARCH}",
+          "datasource": "${DS_JAMES_ES}",
           "fill": 1,
           "id": 6,
           "legend": {
@@ -737,7 +737,7 @@
   ],
   "schemaVersion": 14,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -773,4 +773,4 @@
   "timezone": "browser",
   "title": "SMTP board",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/grafana-reporting/SMTP_count_board-1488774761350-dashboard.json b/grafana-reporting/SMTP_count_board-1488774761350-dashboard.json
index e54c2b4..94276f2 100644
--- a/grafana-reporting/SMTP_count_board-1488774761350-dashboard.json
+++ b/grafana-reporting/SMTP_count_board-1488774761350-dashboard.json
@@ -2,7 +2,7 @@
   "__inputs": [
     {
       "name": "DS_JAMES_ES",
-      "label": "james es",
+      "label": "James Elasticsearch",
       "description": "",
       "type": "datasource",
       "pluginId": "elasticsearch",
@@ -697,7 +697,7 @@
   ],
   "schemaVersion": 14,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -733,4 +733,4 @@
   "timezone": "browser",
   "title": "SMTP count  board",
   "version": 3
-}
\ No newline at end of file
+}
diff --git a/grafana-reporting/SpamAssassin-1522226824255-dashboard.json b/grafana-reporting/SpamAssassin-1522226824255-dashboard.json
index ee3940b..09c3c3a 100644
--- a/grafana-reporting/SpamAssassin-1522226824255-dashboard.json
+++ b/grafana-reporting/SpamAssassin-1522226824255-dashboard.json
@@ -2,7 +2,7 @@
   "__inputs": [
     {
       "name": "DS_JAMES_ES",
-      "label": "james es",
+      "label": "James Elasticsearch",
       "description": "",
       "type": "datasource",
       "pluginId": "elasticsearch",
@@ -697,7 +697,7 @@
   ],
   "schemaVersion": 14,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -733,4 +733,4 @@
   "timezone": "browser",
   "title": "SpamAssassin",
   "version": 10
-}
\ No newline at end of file
+}
diff --git a/grafana-reporting/Tika-1522226794419-dashboard.json b/grafana-reporting/Tika-1522226794419-dashboard.json
index 66b4d5a..5ad3d29 100644
--- a/grafana-reporting/Tika-1522226794419-dashboard.json
+++ b/grafana-reporting/Tika-1522226794419-dashboard.json
@@ -2,7 +2,7 @@
   "__inputs": [
     {
       "name": "DS_JAMES_ES",
-      "label": "james es",
+      "label": "James Elasticsearch",
       "description": "",
       "type": "datasource",
       "pluginId": "elasticsearch",
@@ -1034,7 +1034,7 @@
   ],
   "schemaVersion": 14,
   "style": "dark",
-  "tags": [],
+  "tags": ["James"],
   "templating": {
     "list": []
   },
@@ -1070,4 +1070,4 @@
   "timezone": "browser",
   "title": "Tika",
   "version": 22
-}
\ No newline at end of file
+}


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org