You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by zk...@apache.org on 2022/07/25 08:24:37 UTC

[incubator-devlake] branch main updated: fix: update demo dashboards to display better (#2590)

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

zky pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


The following commit(s) were added to refs/heads/main by this push:
     new ea8ef3d9 fix: update demo dashboards to display better (#2590)
ea8ef3d9 is described below

commit ea8ef3d9c6aca1790f615902f02c65ae45b04149
Author: Louis.z <lo...@gmail.com>
AuthorDate: Mon Jul 25 16:24:32 2022 +0800

    fix: update demo dashboards to display better (#2590)
    
    Co-authored-by: Startrekzky <ka...@merico.dev>
---
 grafana/dashboards/DemoCommitCountByAuthor.json | 12 +++++-----
 grafana/dashboards/DemoDetailedBugInfo.json     | 32 +++++++++++++++++++++----
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/grafana/dashboards/DemoCommitCountByAuthor.json b/grafana/dashboards/DemoCommitCountByAuthor.json
index a4dce65c..e7d2a13e 100644
--- a/grafana/dashboards/DemoCommitCountByAuthor.json
+++ b/grafana/dashboards/DemoCommitCountByAuthor.json
@@ -15,7 +15,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "id": 6,
+  "id": 9,
   "links": [
     {
       "asDropdown": false,
@@ -112,7 +112,7 @@
           "group": [],
           "metricColumn": "none",
           "rawQuery": true,
-          "rawSql": "with commit_data as(\n  SELECT\n    DATE_ADD(date(authored_date), INTERVAL -DAY(date(authored_date))+1 DAY)  as time,\n    c.author_name,\n    count(*) as commit_count\n  FROM commits c\n  WHERE\n    c.message not like '%Merge%'\n    and $__timeFilter(authored_date)\n  group by 2,1\n  order by 2,1\n),\n\nthis_month as(\n  select \n\t\tDATE_ADD(date(CURDATE()), INTERVAL -DAY(date(CURDATE()))+1 DAY) as this_month\n),\n\nlast_month as(\n\tselect \n\t\tDATE_ADD(DATE_ADD( [...]
+          "rawSql": "with commit_data as(\n  SELECT\n    DATE_ADD(date(authored_date), INTERVAL -DAY(date(authored_date))+1 DAY)  as time,\n    c.author_name,\n    count(*) as commit_count\n  FROM commits c\n  WHERE\n    c.message not like '%Merge%'\n    and $__timeFilter(authored_date)\n  group by 2,1\n  order by 2,1\n),\n\nthis_month as(\n  select \n\t\tDATE_ADD(date(CURDATE()), INTERVAL -DAY(date(CURDATE()))+1 DAY) as this_month\n),\n\nlast_month as(\n\tselect \n\t\tDATE_ADD(DATE_ADD( [...]
           "refId": "A",
           "select": [
             [
@@ -138,7 +138,7 @@
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Commit Count by Author",
+      "title": "Commit Count by Author [Top 20]",
       "type": "barchart"
     },
     {
@@ -187,7 +187,7 @@
           "group": [],
           "metricColumn": "none",
           "rawQuery": true,
-          "rawSql": "with commit_data as(\n  SELECT\n    DATE_ADD(date(authored_date), INTERVAL -DAY(date(authored_date))+1 DAY)  as time,\n    c.author_name,\n    count(*) as commit_count\n  FROM commits c\n  WHERE\n    c.message not like '%Merge%'\n    and $__timeFilter(authored_date)\n  group by 2,1\n  order by 2,1\n),\n\nthis_month as(\n  select \n\t\tDATE_ADD(date(CURDATE()), INTERVAL -DAY(date(CURDATE()))+1 DAY) as this_month\n),\n\nlast_month as(\n\tselect \n\t\tDATE_ADD(DATE_ADD( [...]
+          "rawSql": "with commit_data as(\n  SELECT\n    DATE_ADD(date(authored_date), INTERVAL -DAY(date(authored_date))+1 DAY)  as time,\n    c.author_name,\n    count(*) as commit_count\n  FROM commits c\n  WHERE\n    c.message not like '%Merge%'\n    and $__timeFilter(authored_date)\n  group by 2,1\n  order by 2,1\n),\n\nthis_month as(\n  select \n\t\tDATE_ADD(date(CURDATE()), INTERVAL -DAY(date(CURDATE()))+1 DAY) as this_month\n),\n\nlast_month as(\n\tselect \n\t\tDATE_ADD(DATE_ADD( [...]
           "refId": "A",
           "select": [
             [
@@ -231,5 +231,5 @@
   "timezone": "",
   "title": "Demo-Commit Count by Author",
   "uid": "F0iYknc7z",
-  "version": 1
-}
+  "version": 3
+}
\ No newline at end of file
diff --git a/grafana/dashboards/DemoDetailedBugInfo.json b/grafana/dashboards/DemoDetailedBugInfo.json
index 863d5906..c01873fe 100644
--- a/grafana/dashboards/DemoDetailedBugInfo.json
+++ b/grafana/dashboards/DemoDetailedBugInfo.json
@@ -15,7 +15,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "id": 6,
+  "id": 4,
   "links": [
     {
       "asDropdown": false,
@@ -203,6 +203,30 @@
                 "value": 753
               }
             ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "created_date"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 160
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "status"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 284
+              }
+            ]
           }
         ]
       },
@@ -225,7 +249,7 @@
           "metricColumn": "none",
           "queryType": "randomWalk",
           "rawQuery": true,
-          "rawSql": "select \n    title,\n    description,\n    case when assignee_id = '' then '-' else assignee_name end as assignee,\n    status,\n    created_date\n  from issues i\n  where \n    type = 'Bug'\n    and $__timeFilter(created_date)\n  order by created_date desc",
+          "rawSql": "select \n    title,\n    description,\n    case when assignee_id = '' then '-' else assignee_name end as assignee,\n    status,\n    created_date,\n    url\n  from issues i\n  where \n    type = 'Bug'\n    and $__timeFilter(created_date)\n  order by created_date desc",
           "refId": "A",
           "select": [
             [
@@ -265,5 +289,5 @@
   "timezone": "",
   "title": "Demo-Detailed Bug Info",
   "uid": "s48Lzn5nz",
-  "version": 2
-}
+  "version": 1
+}
\ No newline at end of file