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 10b51582f fix: update the wording of the weekly report dashboard 
(#7682)
10b51582f is described below

commit 10b51582fa40657e7109d6d1e355725247acf8b8
Author: Louis.z <[email protected]>
AuthorDate: Fri Jun 28 16:49:10 2024 +0800

    fix: update the wording of the weekly report dashboard (#7682)
    
    Co-authored-by: Startrekzky <[email protected]>
---
 grafana/dashboards/WeeklyReport.json | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/grafana/dashboards/WeeklyReport.json 
b/grafana/dashboards/WeeklyReport.json
index 82d18a03a..61365cc07 100644
--- a/grafana/dashboards/WeeklyReport.json
+++ b/grafana/dashboards/WeeklyReport.json
@@ -18,7 +18,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 21,
+  "id": 4,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -40,7 +40,7 @@
           "showLineNumbers": false,
           "showMiniMap": false
         },
-        "content": "- This dashboard shows all the key metrics in the weekly 
report.",
+        "content": "**Data display conventions for each panel:**\n\n- **First 
Series:** This series displays data for the most recent N days. For N equal to 
7, the label will be 'Last Week'.\n- **'Past 3 Months' Series:** This series 
displays data for the three months preceding the data in the first series.",
         "mode": "markdown"
       },
       "pluginVersion": "11.0.0",
@@ -54,7 +54,6 @@
           "refId": "A"
         }
       ],
-      "title": "Dashboard Introduction",
       "type": "text"
     },
     {
@@ -108,8 +107,7 @@
                 "value": null
               }
             ]
-          },
-          "unit": "d"
+          }
         },
         "overrides": []
       },
@@ -162,7 +160,7 @@
           "hide": false,
           "metricColumn": "none",
           "rawQuery": true,
-          "rawSql": "with _deployed_prs as(\n  SELECT\n    pr.id,\n    
cdc.finished_date as pr_deployed_date,\n    -- convert null to 0 if a PR has no 
cycle_time\n\t  prm.pr_cycle_time\n  FROM pull_requests pr\n    left join 
project_pr_metrics prm on pr.id = prm.id\n    join project_mapping pm on 
pr.base_repo_id = pm.row_id and pm.table = 'repos' \n    join 
cicd_deployment_commits cdc on prm.deployment_commit_id = cdc.id\n  WHERE\n    
-- filter the deployed PRs\n    cdc.finished_date is  [...]
+          "rawSql": "with _deployed_prs as(\n  SELECT\n    pr.id,\n    
cdc.finished_date as pr_deployed_date,\n    -- convert null to 0 if a PR has no 
cycle_time\n\t  prm.pr_cycle_time\n  FROM pull_requests pr\n    left join 
project_pr_metrics prm on pr.id = prm.id\n    join project_mapping pm on 
pr.base_repo_id = pm.row_id and pm.table = 'repos' \n    join 
cicd_deployment_commits cdc on prm.deployment_commit_id = cdc.id\n  WHERE\n    
-- filter the deployed PRs\n    cdc.finished_date is  [...]
           "refId": "A",
           "select": [
             [
@@ -311,7 +309,7 @@
           "hide": false,
           "metricColumn": "none",
           "rawQuery": true,
-          "rawSql": "with _deployed_prs as(\n  SELECT\n    pr.id,\n    
cdc.finished_date as pr_deployed_date,\n    -- convert null to 0 if a PR has no 
cycle_time to make sure cycle_time equals the sum of the four metrics 
below\n\t\tcoalesce(prm.pr_cycle_time/60,0) as cycle_time\n  FROM pull_requests 
pr\n    left join project_pr_metrics prm on pr.id = prm.id\n    join 
project_mapping pm on pr.base_repo_id = pm.row_id and pm.table = 'repos' \n    
join cicd_deployment_commits cdc on prm.dep [...]
+          "rawSql": "with _deployed_prs as(\n  SELECT\n    pr.id,\n    
cdc.finished_date as pr_deployed_date,\n    -- convert null to 0 if a PR has no 
cycle_time to make sure cycle_time equals the sum of the four metrics 
below\n\t\tcoalesce(prm.pr_cycle_time/60,0) as cycle_time\n  FROM pull_requests 
pr\n    left join project_pr_metrics prm on pr.id = prm.id\n    join 
project_mapping pm on pr.base_repo_id = pm.row_id and pm.table = 'repos' \n    
join cicd_deployment_commits cdc on prm.dep [...]
           "refId": "A",
           "select": [
             [
@@ -457,7 +455,7 @@
           "metricColumn": "none",
           "queryType": "randomWalk",
           "rawQuery": true,
-          "rawSql": "with _deployments as(\n-- When deploying multiple commits 
in one pipeline, GitLab and BitBucket may generate more than one deployment. 
However, DevLake consider these deployments as ONE production deployment and 
use the last one's finished_date as the finished 
date.\n\t\tSELECT\n\t\t\tcdc.cicd_deployment_id,\n\t\t\tmax(cdc.finished_date) 
as deployment_finished_date\n\t\tFROM cicd_deployment_commits cdc\n\t\tJOIN 
project_mapping pm on cdc.cicd_scope_id = pm.row_id and [...]
+          "rawSql": "with _deployments as(\n-- When deploying multiple commits 
in one pipeline, GitLab and BitBucket may generate more than one deployment. 
However, DevLake consider these deployments as ONE production deployment and 
use the last one's finished_date as the finished 
date.\n\t\tSELECT\n\t\t\tcdc.cicd_deployment_id,\n\t\t\tmax(cdc.finished_date) 
as deployment_finished_date\n\t\tFROM cicd_deployment_commits cdc\n\t\tJOIN 
project_mapping pm on cdc.cicd_scope_id = pm.row_id and [...]
           "refId": "A",
           "select": [
             [
@@ -606,7 +604,7 @@
           "hide": false,
           "metricColumn": "none",
           "rawQuery": true,
-          "rawSql": "with _deployments as (\n-- When deploying multiple 
commits in one pipeline, GitLab and BitBucket may generate more than one 
deployment. However, DevLake consider these deployments as ONE production 
deployment and use the last one's finished_date as the finished 
date.\n\tSELECT\n\t\tcdc.cicd_deployment_id as 
deployment_id,\n\t\tmax(cdc.finished_date) as deployment_finished_date\n\tFROM 
\n\t\tcicd_deployment_commits cdc\n\t\tJOIN project_mapping pm on 
cdc.cicd_scope_id [...]
+          "rawSql": "with _deployments as (\n-- When deploying multiple 
commits in one pipeline, GitLab and BitBucket may generate more than one 
deployment. However, DevLake consider these deployments as ONE production 
deployment and use the last one's finished_date as the finished 
date.\n\tSELECT\n\t\tcdc.cicd_deployment_id as 
deployment_id,\n\t\tmax(cdc.finished_date) as deployment_finished_date\n\tFROM 
\n\t\tcicd_deployment_commits cdc\n\t\tJOIN project_mapping pm on 
cdc.cicd_scope_id [...]
           "refId": "A",
           "select": [
             [
@@ -651,7 +649,6 @@
       "type": "barchart"
     }
   ],
-  "refresh": "",
   "schemaVersion": 39,
   "tags": [],
   "templating": {
@@ -714,6 +711,6 @@
   "timezone": "",
   "title": "Weekly Report",
   "uid": "fdpx91qgjm0owb",
-  "version": 11,
+  "version": 2,
   "weekStart": ""
 }
\ No newline at end of file

Reply via email to