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

warren 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 bcc32672 feat: access grafana via http://config-ui/grafana
bcc32672 is described below

commit bcc3267268a60d8e403fbda9006926b7c8ca93f9
Author: Klesh Wong <[email protected]>
AuthorDate: Tue Jul 12 19:51:00 2022 +0800

    feat: access grafana via http://config-ui/grafana
    
      Closes #2279
---
 config-ui/nginx.conf                                           | 10 ++++++++--
 docker-compose.yml                                             |  4 +++-
 grafana/_archive/DataSourceSpecificDashboardsHomepage.json     |  8 ++++----
 grafana/_archive/DeliveryCapability(RequireJenkinsData).json   |  4 ++--
 grafana/_archive/DeliveryCost(RequireGitlabData).json          |  4 ++--
 .../_archive/DeliveryQuality(RequireJiraAndGitlabData).json    |  6 +++---
 .../_archive/DeliveryVelocity(RequireJiraAndGitlabData).json   |  6 +++---
 grafana/_archive/Gitlab.json                                   |  6 +++---
 grafana/_archive/Jenkins.json                                  |  4 ++--
 grafana/_archive/UserValueSpecificDashboardsHomepage.json      | 10 +++++-----
 .../dashboards/DemoAverageRequirementLeadTimeByAssignee.json   |  6 +++---
 grafana/dashboards/DemoCommitCountByAuthor.json                |  6 +++---
 grafana/dashboards/DemoDetailedBugInfo.json                    |  6 +++---
 grafana/dashboards/DemoHomepage.json                           |  8 ++++----
 .../DemoHowFastDoWeRespondToCustomerRequirements.json          |  8 ++++----
 grafana/dashboards/DemoIsThisMonthMoreProductiveThanLast.json  |  8 ++++----
 grafana/dashboards/DemoWasOurQualityImprovedOrNot.json         |  8 ++++----
 grafana/dashboards/Jira.json                                   |  4 ++--
 18 files changed, 62 insertions(+), 54 deletions(-)

diff --git a/config-ui/nginx.conf b/config-ui/nginx.conf
index f868324f..5de4c3bc 100644
--- a/config-ui/nginx.conf
+++ b/config-ui/nginx.conf
@@ -19,7 +19,13 @@ ${SERVER_CONF}
     proxy_pass http://$target;
   }
 
-  location /grafana {
-    rewrite /grafana(.*)$ ${GRAFANA_ENDPOINT}$1;
+  location /grafana/ {
+    resolver ${DNS} valid=${DNS_VALID};
+    resolver_timeout 3s;
+    set $target "${GRAFANA_ENDPOINT}";
+    rewrite /grafana/(.*) /$1  break;
+    proxy_send_timeout 10s;
+    proxy_read_timeout 10s;
+    proxy_pass http://$target;
   }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index da39dde6..3ceadf97 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -51,6 +51,8 @@ services:
       - grafana-storage:/var/lib/grafana
     environment:
       GF_USERS_ALLOW_SIGN_UP: 'false'
+      GF_SERVER_ROOT_URL: "http://localhost:4000/grafana";
+      GF_SERVER_SERVE_FROM_SUB_PATH: 'true'
       GF_DASHBOARDS_JSON_ENABLED: 'true'
       GF_LIVE_ALLOWED_ORIGINS: '*'
       MYSQL_URL: mysql:3306
@@ -86,7 +88,7 @@ services:
       - ./.env
     environment:
       DEVLAKE_ENDPOINT: devlake:8080
-      GRAFANA_ENDPOINT: http://localhost:3002
+      GRAFANA_ENDPOINT: grafana:3000
       #ADMIN_USER: devlake
       #ADMIN_PASS: merico
     depends_on:
diff --git a/grafana/_archive/DataSourceSpecificDashboardsHomepage.json 
b/grafana/_archive/DataSourceSpecificDashboardsHomepage.json
index 3d31ae12..ce589d08 100644
--- a/grafana/_archive/DataSourceSpecificDashboardsHomepage.json
+++ b/grafana/_archive/DataSourceSpecificDashboardsHomepage.json
@@ -31,7 +31,7 @@
       "interval": null,
       "links": [],
       "options": {
-        "content": "<a href=\"/d/2e01bLN7z/jira\">\n    <div 
style=\"vertical-align:center;text-align:center;margin:15px;padding-top:60px;\">\n
        <img border=\"0\" src=\"/public/img/lake/jira.png\" alt=\"jira\" 
width=\"120\">\n        <p 
style=\"text-align:center;font-size:20px;margin:20px; 
color:#BFC1C8\"><b>Jira<b></p>\n    </div>\n</a>",
+        "content": "<a href=\"/grafana/d/2e01bLN7z/jira\">\n    <div 
style=\"vertical-align:center;text-align:center;margin:15px;padding-top:60px;\">\n
        <img border=\"0\" src=\"/grafana/public/img/lake/jira.png\" 
alt=\"jira\" width=\"120\">\n        <p 
style=\"text-align:center;font-size:20px;margin:20px; 
color:#BFC1C8\"><b>Jira<b></p>\n    </div>\n</a>",
         "mode": "html"
       },
       "pluginVersion": "8.0.6",
@@ -82,7 +82,7 @@
       "interval": null,
       "links": [],
       "options": {
-        "content": "<a href=\"/d/6YcsxLN7z/gitlab\">\n    <div 
style=\"vertical-align:center;text-align:center;margin:15px;padding-top:60px;\">\n
        <img border=\"0\" src=\"/public/img/lake/gitlab.png\" alt=\"gitlab\" 
width=\"120\">\n        <p 
style=\"text-align:center;font-size:20px;margin:20px;color:#BFC1C8\"><b>Gitlab<b></p>\n
    </div>\n</a>",
+        "content": "<a href=\"/grafana/d/6YcsxLN7z/gitlab\">\n    <div 
style=\"vertical-align:center;text-align:center;margin:15px;padding-top:60px;\">\n
        <img border=\"0\" src=\"/public/img/lake/gitlab.png\" alt=\"gitlab\" 
width=\"120\">\n        <p 
style=\"text-align:center;font-size:20px;margin:20px;color:#BFC1C8\"><b>Gitlab<b></p>\n
    </div>\n</a>",
         "mode": "html"
       },
       "pluginVersion": "8.0.6",
@@ -182,7 +182,7 @@
       "interval": null,
       "links": [],
       "options": {
-        "content": "<a href=\"/d/zDsUxYHnz/jenkins\"> \n    <div 
style=\"vertical-align:center;text-align:center;margin:15px;padding-top:60px;\">\n
        <img border=\"0\" src=\"/public/img/lake/jenkins.png\" alt=\"jenkins\" 
width=\"120\">\n        <p 
style=\"text-align:center;font-size:20px;margin:20px;color:#BFC1C8\"><b>Jenkins<b></p>\n
    </div>\n</a>",
+        "content": "<a href=\"/grafana/d/zDsUxYHnz/jenkins\"> \n    <div 
style=\"vertical-align:center;text-align:center;margin:15px;padding-top:60px;\">\n
        <img border=\"0\" src=\"/public/img/lake/jenkins.png\" alt=\"jenkins\" 
width=\"120\">\n        <p 
style=\"text-align:center;font-size:20px;margin:20px;color:#BFC1C8\"><b>Jenkins<b></p>\n
    </div>\n</a>",
         "mode": "html"
       },
       "pluginVersion": "8.0.6",
@@ -290,4 +290,4 @@
   "title": "Data Source Specific Dashboards-Homepage",
   "uid": "Lv1XbLHnk",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/grafana/_archive/DeliveryCapability(RequireJenkinsData).json 
b/grafana/_archive/DeliveryCapability(RequireJenkinsData).json
index 1a0dd2e3..36aa2d01 100644
--- a/grafana/_archive/DeliveryCapability(RequireJenkinsData).json
+++ b/grafana/_archive/DeliveryCapability(RequireJenkinsData).json
@@ -28,7 +28,7 @@
       "title": "Homepage",
       "tooltip": "",
       "type": "link",
-      "url": "/d/RXJZNpMnz/user-value-specific-dashboards-homepage?orgId=1"
+      "url": 
"/grafana/d/RXJZNpMnz/user-value-specific-dashboards-homepage?orgId=1"
     },
     {
       "asDropdown": false,
@@ -467,4 +467,4 @@
   "title": "Delivery Capability (require Jenkins data)",
   "uid": "3Lv1ImSnk",
   "version": 5
-}
\ No newline at end of file
+}
diff --git a/grafana/_archive/DeliveryCost(RequireGitlabData).json 
b/grafana/_archive/DeliveryCost(RequireGitlabData).json
index 793f60b5..b5faba83 100644
--- a/grafana/_archive/DeliveryCost(RequireGitlabData).json
+++ b/grafana/_archive/DeliveryCost(RequireGitlabData).json
@@ -28,7 +28,7 @@
       "title": "Homepage",
       "tooltip": "",
       "type": "link",
-      "url": "/d/RXJZNpMnz/user-value-specific-dashboards-homepage?orgId=1"
+      "url": 
"/grafana/d/RXJZNpMnz/user-value-specific-dashboards-homepage?orgId=1"
     },
     {
       "asDropdown": false,
@@ -405,4 +405,4 @@
   "title": "Delivery Cost (require Gitlab data)",
   "uid": "TV-BnpM7k",
   "version": 7
-}
\ No newline at end of file
+}
diff --git a/grafana/_archive/DeliveryQuality(RequireJiraAndGitlabData).json 
b/grafana/_archive/DeliveryQuality(RequireJiraAndGitlabData).json
index 94807b6f..92e2fef5 100644
--- a/grafana/_archive/DeliveryQuality(RequireJiraAndGitlabData).json
+++ b/grafana/_archive/DeliveryQuality(RequireJiraAndGitlabData).json
@@ -28,7 +28,7 @@
       "title": "Homepage",
       "tooltip": "",
       "type": "link",
-      "url": "/d/RXJZNpMnz/user-value-specific-dashboards-homepage?orgId=1"
+      "url": 
"/grafana/d/RXJZNpMnz/user-value-specific-dashboards-homepage?orgId=1"
     },
     {
       "asDropdown": false,
@@ -59,7 +59,7 @@
       "interval": null,
       "links": [],
       "options": {
-        "content": "<div style=\"text-align:center;\">\n    <div 
style=\"display:inline-block;text-align:center;padding-top:10px;\">\n        
<img border=\"0\" 
src=\"/public/img/lake/practice_process_delivery_quality.png\" alt=\"R&D 
Process\" width=\"50%\">\n    </div>\n</div>",
+        "content": "<div style=\"text-align:center;\">\n    <div 
style=\"display:inline-block;text-align:center;padding-top:10px;\">\n        
<img border=\"0\" 
src=\"/grafana/public/img/lake/practice_process_delivery_quality.png\" 
alt=\"R&D Process\" width=\"50%\">\n    </div>\n</div>",
         "mode": "html"
       },
       "pluginVersion": "8.0.6",
@@ -1696,4 +1696,4 @@
   "title": "Delivery Quality (require Jira and Gitlab data)",
   "uid": "nUC-7tGnk",
   "version": 14
-}
\ No newline at end of file
+}
diff --git a/grafana/_archive/DeliveryVelocity(RequireJiraAndGitlabData).json 
b/grafana/_archive/DeliveryVelocity(RequireJiraAndGitlabData).json
index b0f3b0b8..8df95d94 100644
--- a/grafana/_archive/DeliveryVelocity(RequireJiraAndGitlabData).json
+++ b/grafana/_archive/DeliveryVelocity(RequireJiraAndGitlabData).json
@@ -28,7 +28,7 @@
       "title": "Homepage",
       "tooltip": "",
       "type": "link",
-      "url": "/d/RXJZNpMnz/user-value-specific-dashboards-homepage?orgId=1"
+      "url": 
"/grafana/d/RXJZNpMnz/user-value-specific-dashboards-homepage?orgId=1"
     },
     {
       "asDropdown": false,
@@ -59,7 +59,7 @@
       "interval": null,
       "links": [],
       "options": {
-        "content": "<div style=\"text-align:center;\">\n    <div 
style=\"display:inline-block;text-align:center;padding-top:10px;\">\n        
<img border=\"0\" 
src=\"/public/img/lake/practice_process_delivery_velocity.png\" alt=\"R&D 
Process\" width=\"60%\">\n    </div>\n</div>",
+        "content": "<div style=\"text-align:center;\">\n    <div 
style=\"display:inline-block;text-align:center;padding-top:10px;\">\n        
<img border=\"0\" 
src=\"/grafana/public/img/lake/practice_process_delivery_velocity.png\" 
alt=\"R&D Process\" width=\"60%\">\n    </div>\n</div>",
         "mode": "html"
       },
       "pluginVersion": "8.0.6",
@@ -4090,4 +4090,4 @@
   "title": "Delivery Velocity (require Jira and Gitlab data)",
   "uid": "ZfaFQeM7k",
   "version": 20
-}
\ No newline at end of file
+}
diff --git a/grafana/_archive/Gitlab.json b/grafana/_archive/Gitlab.json
index fe27cbf8..1baf386b 100644
--- a/grafana/_archive/Gitlab.json
+++ b/grafana/_archive/Gitlab.json
@@ -28,7 +28,7 @@
       "title": "Homepage",
       "tooltip": "",
       "type": "link",
-      "url": "/d/Lv1XbLHnk/data-specific-dashboards-homepage"
+      "url": "/grafana/d/Lv1XbLHnk/data-specific-dashboards-homepage"
     },
     {
       "asDropdown": false,
@@ -56,7 +56,7 @@
       },
       "id": 48,
       "options": {
-        "content": "<div style=\"display: block;text-align: center;margin-top: 
56px;\">\n  <div style=\"display: inline-flex;\">\n    <img 
src=\"/public/img/lake/1.png\" alt=\"No.1\" width=\"56\">\n    <p 
style=\"font-size:24px; margin:10px; color:#BFC1C8;\"><b>MR Troughput and Pass 
Rate<b></b></b></p><b><b>\n  </div>\n</div>",
+        "content": "<div style=\"display: block;text-align: center;margin-top: 
56px;\">\n  <div style=\"display: inline-flex;\">\n    <img 
src=\"/grafana/public/img/lake/1.png\" alt=\"No.1\" width=\"56\">\n    <p 
style=\"font-size:24px; margin:10px; color:#BFC1C8;\"><b>MR Troughput and Pass 
Rate<b></b></b></p><b><b>\n  </div>\n</div>",
         "mode": "html"
       },
       "pluginVersion": "8.0.6",
@@ -2183,4 +2183,4 @@
   "title": "Gitlab",
   "uid": "6YcsxLN7z",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/grafana/_archive/Jenkins.json b/grafana/_archive/Jenkins.json
index ea0b85df..049b88e5 100644
--- a/grafana/_archive/Jenkins.json
+++ b/grafana/_archive/Jenkins.json
@@ -28,7 +28,7 @@
       "title": "Homepage",
       "tooltip": "",
       "type": "link",
-      "url": "/d/Lv1XbLHnk/data-specific-dashboards-homepage"
+      "url": "/grafana/d/Lv1XbLHnk/data-specific-dashboards-homepage"
     },
     {
       "asDropdown": false,
@@ -467,4 +467,4 @@
   "title": "Jenkins",
   "uid": "zDsUxYHnz",
   "version": 13894
-}
\ No newline at end of file
+}
diff --git a/grafana/_archive/UserValueSpecificDashboardsHomepage.json 
b/grafana/_archive/UserValueSpecificDashboardsHomepage.json
index d4a6cbe9..4c1be1f9 100644
--- a/grafana/_archive/UserValueSpecificDashboardsHomepage.json
+++ b/grafana/_archive/UserValueSpecificDashboardsHomepage.json
@@ -31,7 +31,7 @@
       "interval": null,
       "links": [],
       "options": {
-        "content": "<a 
href=\"/d/ZfaFQeM7k/delivery-velocity-require-jira-and-gitlab-data?orgId=1\">\n 
   <div 
style=\"vertical-align:center;text-align:center;margin:15px;padding-top:60px;\">\n
        <img border=\"0\" src=\"/public/img/lake/delivery_velocity.png\" 
alt=\"velocity\" width=\"120\">\n        <p 
style=\"text-align:center;font-size:20px;margin:20px; 
color:#BFC1C8\"><b>Delivery Velocity<b></p>\n    </div>\n</a>",
+        "content": "<a 
href=\"/grafana/d/ZfaFQeM7k/delivery-velocity-require-jira-and-gitlab-data?orgId=1\">\n
    <div 
style=\"vertical-align:center;text-align:center;margin:15px;padding-top:60px;\">\n
        <img border=\"0\" 
src=\"/grafana/public/img/lake/delivery_velocity.png\" alt=\"velocity\" 
width=\"120\">\n        <p 
style=\"text-align:center;font-size:20px;margin:20px; 
color:#BFC1C8\"><b>Delivery Velocity<b></p>\n    </div>\n</a>",
         "mode": "html"
       },
       "pluginVersion": "8.0.6",
@@ -82,7 +82,7 @@
       "interval": null,
       "links": [],
       "options": {
-        "content": "<a 
href=\"/d/nUC-7tGnk/delivery-quality-require-jira-and-gitlab-data?orgId=1\">\n  
  <div 
style=\"vertical-align:center;text-align:center;margin:15px;padding-top:60px;\">\n
        <img border=\"0\" src=\"/public/img/lake/delivery_quality.png\" 
alt=\"quality\" width=\"120\">\n        <p 
style=\"text-align:center;font-size:20px;margin:20px;color:#BFC1C8\"><b>Delivery
 Quality<b></p>\n    </div>\n</a>",
+        "content": "<a 
href=\"/grafana/d/nUC-7tGnk/delivery-quality-require-jira-and-gitlab-data?orgId=1\">\n
    <div 
style=\"vertical-align:center;text-align:center;margin:15px;padding-top:60px;\">\n
        <img border=\"0\" src=\"/public/img/lake/delivery_quality.png\" 
alt=\"quality\" width=\"120\">\n        <p 
style=\"text-align:center;font-size:20px;margin:20px;color:#BFC1C8\"><b>Delivery
 Quality<b></p>\n    </div>\n</a>",
         "mode": "html"
       },
       "pluginVersion": "8.0.6",
@@ -182,7 +182,7 @@
       "interval": null,
       "links": [],
       "options": {
-        "content": "<a 
href=\"/d/TV-BnpM7k/delivery-cost-require-gitlab-data?orgId=1\"> \n    <div 
style=\"vertical-align:center;text-align:center;margin:15px;padding-top:60px;\">\n
        <img border=\"0\" src=\"/public/img/lake/delivery_cost.png\" 
alt=\"cost\" width=\"120\">\n        <p 
style=\"text-align:center;font-size:20px;margin:20px;color:#BFC1C8\"><b>Delivery
 Cost<b></p>\n    </div>\n</a>",
+        "content": "<a 
href=\"/grafana/d/TV-BnpM7k/delivery-cost-require-gitlab-data?orgId=1\"> \n    
<div 
style=\"vertical-align:center;text-align:center;margin:15px;padding-top:60px;\">\n
        <img border=\"0\" src=\"/public/img/lake/delivery_cost.png\" 
alt=\"cost\" width=\"120\">\n        <p 
style=\"text-align:center;font-size:20px;margin:20px;color:#BFC1C8\"><b>Delivery
 Cost<b></p>\n    </div>\n</a>",
         "mode": "html"
       },
       "pluginVersion": "8.0.6",
@@ -233,7 +233,7 @@
       "interval": null,
       "links": [],
       "options": {
-        "content": "<a 
href=\"/d/3Lv1ImSnk/delivery-capability-require-jenkins-data?orgId=1\"> \n    
<div 
style=\"vertical-align:center;text-align:center;margin:15px;padding-top:60px;\">\n
        <img border=\"0\" src=\"/public/img/lake/delivery_capability.png\" 
alt=\"capability\" width=\"120\">\n        <p 
style=\"text-align:center;font-size:20px;margin:20px;color:#BFC1C8\"><b>Delivery
 Capability<b></p>\n    </div>\n</a>",
+        "content": "<a 
href=\"/grafana/d/3Lv1ImSnk/delivery-capability-require-jenkins-data?orgId=1\"> 
\n    <div 
style=\"vertical-align:center;text-align:center;margin:15px;padding-top:60px;\">\n
        <img border=\"0\" src=\"/public/img/lake/delivery_capability.png\" 
alt=\"capability\" width=\"120\">\n        <p 
style=\"text-align:center;font-size:20px;margin:20px;color:#BFC1C8\"><b>Delivery
 Capability<b></p>\n    </div>\n</a>",
         "mode": "html"
       },
       "pluginVersion": "8.0.6",
@@ -341,4 +341,4 @@
   "title": "User Value Specific Dashboards-Homepage",
   "uid": "RXJZNpMnz",
   "version": 14
-}
\ No newline at end of file
+}
diff --git a/grafana/dashboards/DemoAverageRequirementLeadTimeByAssignee.json 
b/grafana/dashboards/DemoAverageRequirementLeadTimeByAssignee.json
index 1c1a3f1a..61cd49dd 100644
--- a/grafana/dashboards/DemoAverageRequirementLeadTimeByAssignee.json
+++ b/grafana/dashboards/DemoAverageRequirementLeadTimeByAssignee.json
@@ -27,7 +27,7 @@
       "title": "Homepage",
       "tooltip": "",
       "type": "link",
-      "url": "/d/0Rjxknc7z/demo-homepage?orgId=1"
+      "url": "/grafana/d/0Rjxknc7z/demo-homepage?orgId=1"
     },
     {
       "asDropdown": false,
@@ -39,7 +39,7 @@
       "title": "Back to previous page",
       "tooltip": "",
       "type": "link",
-      "url": 
"/d/SupYz7c7z/demo-how-fast-do-we-respond-to-customer-requirements?orgId=1"
+      "url": 
"/grafana/d/SupYz7c7z/demo-how-fast-do-we-respond-to-customer-requirements?orgId=1"
     }
   ],
   "panels": [
@@ -225,4 +225,4 @@
   "title": "Demo-Average Requirement Lead Time By Assignee",
   "uid": "q27fk7cnk",
   "version": 1
-}
\ No newline at end of file
+}
diff --git a/grafana/dashboards/DemoCommitCountByAuthor.json 
b/grafana/dashboards/DemoCommitCountByAuthor.json
index f9bfbd95..a4dce65c 100644
--- a/grafana/dashboards/DemoCommitCountByAuthor.json
+++ b/grafana/dashboards/DemoCommitCountByAuthor.json
@@ -27,7 +27,7 @@
       "title": "Homepage",
       "tooltip": "",
       "type": "link",
-      "url": "/d/0Rjxknc7z/demo-homepage?orgId=1"
+      "url": "/grafana/d/0Rjxknc7z/demo-homepage?orgId=1"
     },
     {
       "asDropdown": false,
@@ -39,7 +39,7 @@
       "title": "Back to previous page",
       "tooltip": "",
       "type": "link",
-      "url": 
"/d/ddREk75nk/demo-is-this-month-more-productive-than-last?orgId=1"
+      "url": 
"/grafana/d/ddREk75nk/demo-is-this-month-more-productive-than-last?orgId=1"
     }
   ],
   "panels": [
@@ -232,4 +232,4 @@
   "title": "Demo-Commit Count by Author",
   "uid": "F0iYknc7z",
   "version": 1
-}
\ No newline at end of file
+}
diff --git a/grafana/dashboards/DemoDetailedBugInfo.json 
b/grafana/dashboards/DemoDetailedBugInfo.json
index 64c69e97..863d5906 100644
--- a/grafana/dashboards/DemoDetailedBugInfo.json
+++ b/grafana/dashboards/DemoDetailedBugInfo.json
@@ -27,7 +27,7 @@
       "title": "Homepage",
       "tooltip": "",
       "type": "link",
-      "url": "/d/0Rjxknc7z/demo-homepage?orgId=1"
+      "url": "/grafana/d/0Rjxknc7z/demo-homepage?orgId=1"
     },
     {
       "asDropdown": false,
@@ -39,7 +39,7 @@
       "title": "Back to previous page",
       "tooltip": "",
       "type": "link",
-      "url": "/d/G4DEk75nz/demo-was-our-quality-improved-or-not?orgId=1"
+      "url": 
"/grafana/d/G4DEk75nz/demo-was-our-quality-improved-or-not?orgId=1"
     }
   ],
   "panels": [
@@ -266,4 +266,4 @@
   "title": "Demo-Detailed Bug Info",
   "uid": "s48Lzn5nz",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/grafana/dashboards/DemoHomepage.json 
b/grafana/dashboards/DemoHomepage.json
index bcb4930a..dd684e93 100644
--- a/grafana/dashboards/DemoHomepage.json
+++ b/grafana/dashboards/DemoHomepage.json
@@ -31,7 +31,7 @@
       "interval": null,
       "links": [],
       "options": {
-        "content": "<a 
href=\"/d/SupYz7c7z/demo-how-fast-do-we-respond-to-customer-requirements?orgId=1\">\n
    <div 
style=\"vertical-align:center;text-align:center;margin:15px;padding-top:60px;\">\n
        <img border=\"0\" src=\"/public/img/lake/customer.png\" 
alt=\"customer\" width=\"50\">\n        <p 
style=\"text-align:center;font-size:18px;margin:20px; color:#BFC1C8\"><b>How 
fast do we respond to customer requirements?<b></p>\n    </div>\n</a>",
+        "content": "<a 
href=\"/grafana/d/SupYz7c7z/demo-how-fast-do-we-respond-to-customer-requirements?orgId=1\">\n
    <div 
style=\"vertical-align:center;text-align:center;margin:15px;padding-top:60px;\">\n
        <img border=\"0\" src=\"/grafana/public/img/lake/customer.png\" 
alt=\"customer\" width=\"50\">\n        <p 
style=\"text-align:center;font-size:18px;margin:20px; color:#BFC1C8\"><b>How 
fast do we respond to customer requirements?<b></p>\n    </div>\n</a>",
         "mode": "html"
       },
       "pluginVersion": "8.0.6",
@@ -82,7 +82,7 @@
       "interval": null,
       "links": [],
       "options": {
-        "content": "<a 
href=\"/d/G4DEk75nz/demo-was-our-quality-improved-or-not?orgId=1\">\n    <div 
style=\"vertical-align:center;text-align:center;margin:15px;padding-top:60px;\">\n
        <img border=\"0\" src=\"/public/img/lake/demo_quality.png\" 
alt=\"quality\" width=\"50\">\n        <p 
style=\"text-align:center;font-size:18px;margin:20px; color:#BFC1C8\"><b>Was 
our quality improved or not?<b></p>\n    </div>\n</a>",
+        "content": "<a 
href=\"/grafana/d/G4DEk75nz/demo-was-our-quality-improved-or-not?orgId=1\">\n   
 <div 
style=\"vertical-align:center;text-align:center;margin:15px;padding-top:60px;\">\n
        <img border=\"0\" src=\"/grafana/public/img/lake/demo_quality.png\" 
alt=\"quality\" width=\"50\">\n        <p 
style=\"text-align:center;font-size:18px;margin:20px; color:#BFC1C8\"><b>Was 
our quality improved or not?<b></p>\n    </div>\n</a>",
         "mode": "html"
       },
       "pluginVersion": "8.0.6",
@@ -133,7 +133,7 @@
       "interval": null,
       "links": [],
       "options": {
-        "content": "<a 
href=\"/d/ddREk75nk/demo-is-this-month-more-productive-than-last?orgId=1\">\n   
 <div 
style=\"vertical-align:center;text-align:center;margin:15px;padding-top:60px;\">\n
        <img border=\"0\" src=\"/public/img/lake/trend.png\" alt=\"customer\" 
width=\"50\">\n        <p style=\"text-align:center;font-size:18px;margin:20px; 
color:#BFC1C8\"><b>Is this month more productive than last?<b></p>\n    
</div>\n</a>",
+        "content": "<a 
href=\"/d/ddREk75nk/demo-is-this-month-more-productive-than-last?orgId=1\">\n   
 <div 
style=\"vertical-align:center;text-align:center;margin:15px;padding-top:60px;\">\n
        <img border=\"0\" src=\"/grafana/public/img/lake/trend.png\" 
alt=\"customer\" width=\"50\">\n        <p 
style=\"text-align:center;font-size:18px;margin:20px; color:#BFC1C8\"><b>Is 
this month more productive than last?<b></p>\n    </div>\n</a>",
         "mode": "html"
       },
       "pluginVersion": "8.0.6",
@@ -188,4 +188,4 @@
   "title": "Demo-Homepage",
   "uid": "0Rjxknc7z",
   "version": 7
-}
\ No newline at end of file
+}
diff --git 
a/grafana/dashboards/DemoHowFastDoWeRespondToCustomerRequirements.json 
b/grafana/dashboards/DemoHowFastDoWeRespondToCustomerRequirements.json
index 1626a341..4a8c6b22 100644
--- a/grafana/dashboards/DemoHowFastDoWeRespondToCustomerRequirements.json
+++ b/grafana/dashboards/DemoHowFastDoWeRespondToCustomerRequirements.json
@@ -27,7 +27,7 @@
       "title": "Homepage",
       "tooltip": "",
       "type": "link",
-      "url": "/d/0Rjxknc7z/demo-homepage?orgId=1"
+      "url": "/grafana/d/0Rjxknc7z/demo-homepage?orgId=1"
     }
   ],
   "panels": [
@@ -81,7 +81,7 @@
       "links": [
         {
           "title": "Drill down by Assignee",
-          "url": 
"/d/q27fk7cnk/demo-average-requirement-lead-time-by-assignee?orgId=1"
+          "url": 
"/grafana/d/q27fk7cnk/demo-average-requirement-lead-time-by-assignee?orgId=1"
         }
       ],
       "options": {
@@ -169,7 +169,7 @@
       },
       "id": 101,
       "options": {
-        "content": "<div>\n  <img border=\"0\" 
src=\"/public/img/lake/logo.png\" style=\"padding-bottom:20px\" alt=\"Merico\" 
width=\"40\"></img>\n  <h2 style=\"display:inline-block;\">MARI Guide - 
Requirement Lead Time</h2>\n</div>\n\nSection | Description\n:----------------- 
| :-------------\nMetric Definition | Total duration of requirements from 
proposal to delivery. It can be divided by flow status in the practice domain 
or project management system to count the time share of each p [...]
+        "content": "<div>\n  <img border=\"0\" 
src=\"/grafana/public/img/lake/logo.png\" style=\"padding-bottom:20px\" 
alt=\"Merico\" width=\"40\"></img>\n  <h2 style=\"display:inline-block;\">MARI 
Guide - Requirement Lead Time</h2>\n</div>\n\nSection | 
Description\n:----------------- | :-------------\nMetric Definition | Total 
duration of requirements from proposal to delivery. It can be divided by flow 
status in the practice domain or project management system to count the time 
share o [...]
         "mode": "markdown"
       },
       "pluginVersion": "8.0.6",
@@ -198,4 +198,4 @@
   "title": "Demo-How fast do we respond to customer requirements?",
   "uid": "SupYz7c7z",
   "version": 11
-}
\ No newline at end of file
+}
diff --git a/grafana/dashboards/DemoIsThisMonthMoreProductiveThanLast.json 
b/grafana/dashboards/DemoIsThisMonthMoreProductiveThanLast.json
index b8f81465..4cf33ccb 100644
--- a/grafana/dashboards/DemoIsThisMonthMoreProductiveThanLast.json
+++ b/grafana/dashboards/DemoIsThisMonthMoreProductiveThanLast.json
@@ -27,7 +27,7 @@
       "title": "Homepage",
       "tooltip": "",
       "type": "link",
-      "url": "/d/0Rjxknc7z/demo-homepage?orgId=1"
+      "url": "/grafana/d/0Rjxknc7z/demo-homepage?orgId=1"
     }
   ],
   "panels": [
@@ -56,7 +56,7 @@
             {
               "targetBlank": true,
               "title": "Break down by user1",
-              "url": 
"/d/cHnTA7K7z/is-this-month-more-productive-than-last-by-users?orgId=1"
+              "url": 
"/grafana/d/cHnTA7K7z/is-this-month-more-productive-than-last-by-users?orgId=1"
             }
           ],
           "mappings": [],
@@ -199,7 +199,7 @@
       },
       "id": 38,
       "options": {
-        "content": "<div>\n  <img border=\"0\" 
src=\"/public/img/lake/logo.png\" style=\"padding-bottom:20px\" alt=\"Merico\" 
width=\"40\"></img>\n  <h2 style=\"display:inline-block;\">MARI Guide - Commit 
Count</h2>\n</div>\n\nSection | Description\n:------------------ | 
:-------------\nMetric Definition | The total number of commits.\nMetric Value 
| The number of commits reflects the frequency of code commits and encourages 
multiple small step commits per day. While paying attention to  [...]
+        "content": "<div>\n  <img border=\"0\" 
src=\"/grafana/public/img/lake/logo.png\" style=\"padding-bottom:20px\" 
alt=\"Merico\" width=\"40\"></img>\n  <h2 style=\"display:inline-block;\">MARI 
Guide - Commit Count</h2>\n</div>\n\nSection | Description\n:------------------ 
| :-------------\nMetric Definition | The total number of commits.\nMetric 
Value | The number of commits reflects the frequency of code commits and 
encourages multiple small step commits per day. While paying atten [...]
         "mode": "markdown"
       },
       "pluginVersion": "8.0.6",
@@ -228,4 +228,4 @@
   "title": "Demo-Is this month more productive than last?",
   "uid": "ddREk75nk",
   "version": 6
-}
\ No newline at end of file
+}
diff --git a/grafana/dashboards/DemoWasOurQualityImprovedOrNot.json 
b/grafana/dashboards/DemoWasOurQualityImprovedOrNot.json
index be257da1..7aae3ad1 100644
--- a/grafana/dashboards/DemoWasOurQualityImprovedOrNot.json
+++ b/grafana/dashboards/DemoWasOurQualityImprovedOrNot.json
@@ -27,7 +27,7 @@
       "title": "Homepage",
       "tooltip": "",
       "type": "link",
-      "url": "/d/0Rjxknc7z/demo-homepage?orgId=1"
+      "url": "/grafana/d/0Rjxknc7z/demo-homepage?orgId=1"
     }
   ],
   "panels": [
@@ -81,7 +81,7 @@
         {
           "targetBlank": false,
           "title": "See Detailed Bug Info",
-          "url": "/d/s48Lzn5nz/demo-detailed-bug-info?orgId=1"
+          "url": "/grafana/d/s48Lzn5nz/demo-detailed-bug-info?orgId=1"
         }
       ],
       "options": {
@@ -166,7 +166,7 @@
       },
       "id": 32,
       "options": {
-        "content": "<div>\n  <img border=\"0\" 
src=\"/public/img/lake/logo.png\" style=\"padding-bottom:20px\" alt=\"Merico\" 
width=\"40\"></img>\n  <h2 style=\"display:inline-block;\">MARI Guide - Bug 
Count per 1k Lines of Code</h2>\n</div>\n\nSection | 
Description\n:----------------- | :-------------\nMetric Definition | The ratio 
of the number of bugs found to the corresponding amount of code or code 
changes, to characterize the density of overall bugs, including bugs found in 
testing [...]
+        "content": "<div>\n  <img border=\"0\" 
src=\"/grafana/public/img/lake/logo.png\" style=\"padding-bottom:20px\" 
alt=\"Merico\" width=\"40\"></img>\n  <h2 style=\"display:inline-block;\">MARI 
Guide - Bug Count per 1k Lines of Code</h2>\n</div>\n\nSection | 
Description\n:----------------- | :-------------\nMetric Definition | The ratio 
of the number of bugs found to the corresponding amount of code or code 
changes, to characterize the density of overall bugs, including bugs found in 
[...]
         "mode": "markdown"
       },
       "pluginVersion": "8.0.6",
@@ -195,4 +195,4 @@
   "title": "Demo-Was our quality improved or not?",
   "uid": "G4DEk75nz",
   "version": 20
-}
\ No newline at end of file
+}
diff --git a/grafana/dashboards/Jira.json b/grafana/dashboards/Jira.json
index c2ddab5c..793a81b4 100644
--- a/grafana/dashboards/Jira.json
+++ b/grafana/dashboards/Jira.json
@@ -28,7 +28,7 @@
       "title": "Homepage",
       "tooltip": "",
       "type": "link",
-      "url": "/d/Lv1XbLHnk/data-specific-dashboards-homepage"
+      "url": "/grafana/d/Lv1XbLHnk/data-specific-dashboards-homepage"
     },
     {
       "asDropdown": false,
@@ -983,4 +983,4 @@
   "title": "Jira",
   "uid": "F5vqBQl7z",
   "version": 65
-}
\ No newline at end of file
+}

Reply via email to