Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(docker-compose): add a way to change default datasource #8127

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions devops/deployment/k8s/k8s-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ metadata:
namespace: devlake
data:
# shared between deployment
MYSQL_USER: merico
MYSQL_PASSWORD: merico
MYSQL_DATABASE: lake
MYSQL_ROOT_PASSWORD: admin
MYSQL_URL: mysql:3306
DB_TYPE: mysql
DB_HOST: mysql:3306
DB_DATABASE: lake
DB_USER: merico
DB_PASSWORD: merico
# grafana deployment
GF_SERVER_ROOT_URL: http://YOURDOMAIN:30002/grafana
GF_USERS_DEFAULT_THEME: "light"
Expand Down
9 changes: 5 additions & 4 deletions devops/deployment/temporal/docker-compose-temporal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,11 @@ services:
GF_USERS_ALLOW_SIGN_UP: 'false'
GF_DASHBOARDS_JSON_ENABLED: 'true'
GF_LIVE_ALLOWED_ORIGINS: '*'
MYSQL_URL: mysql:3306
MYSQL_DATABASE: lake
MYSQL_USER: merico
MYSQL_PASSWORD: merico
DB_TYPE: mysql
DB_HOST: mysql:3306
DB_DATABASE: lake
DB_USER: merico
DB_PASSWORD: merico
restart: always
depends_on:
- mysql
Expand Down
9 changes: 5 additions & 4 deletions docker-compose-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,11 @@ services:
environment:
GF_SERVER_ROOT_URL: "http://localhost:4000/grafana"
GF_USERS_DEFAULT_THEME: "light"
MYSQL_URL: mysql:3306
MYSQL_DATABASE: lake
MYSQL_USER: merico
MYSQL_PASSWORD: merico
DB_TYPE: mysql
DB_HOST: mysql:3306
DB_DATABASE: lake
DB_USER: merico
DB_PASSWORD: merico
TZ: UTC
restart: always
depends_on:
Expand Down
4 changes: 2 additions & 2 deletions grafana/_archive/Daily_Needs_To_Be_Improved.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"type": "text"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -162,7 +162,7 @@
"type": "piechart"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "",
"fieldConfig": {
"defaults": {
Expand Down
10 changes: 5 additions & 5 deletions grafana/_archive/DeliveryCapability(RequireJenkinsData).json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
],
"panels": [
{
"datasource": "mysql",
"datasource": "default",
"description": "1. Number of builds executed.\n2. The builds being calculated are filtered by \"build starting time\" (time filter at the upper-right corner) and \"Jira board\" (\"Choose Board\" filter at the upper-left corner)",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -124,7 +124,7 @@
},
{
"cacheTimeout": null,
"datasource": "mysql",
"datasource": "default",
"description": "The percentage of successful, failed, and aborted builds.",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -215,7 +215,7 @@
"type": "piechart"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "Number of successful builds / Number of total builds",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -298,7 +298,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "mysql",
"datasource": "default",
"description": "1. Build success rate over time.\n2. The builds being calculated are filtered by \"build starting time\" (time filter at the upper-right corner) and \"Jira board\" (\"Choose Board\" filter at the upper-left corner)",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -467,4 +467,4 @@
"title": "Delivery Capability (require Jenkins data)",
"uid": "3Lv1ImSnk",
"version": 5
}
}
12 changes: 6 additions & 6 deletions grafana/_archive/DeliveryCost(RequireGitlabData).json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
],
"panels": [
{
"datasource": "mysql",
"datasource": "default",
"description": "1. Number of people who have created or reviewed a Pull/Merge Request.\n2. The PR/MR being calculated are filtered by \"PR/MR creation time\" (time filter at the upper-right corner).",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -128,7 +128,7 @@
"type": "stat"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "1. Total number of Commit Authors.\n2. The commits being calculated are filtered by \"authored_date\" (time filter at the upper-right corner).",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -204,7 +204,7 @@
"type": "stat"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "1. Number of Pull/Merge Request Reviewers.\n2. The PR/MR being calculated are filtered by \"PR/MR creation time\" (time filter at the upper-right corner).",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -280,7 +280,7 @@
"type": "stat"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "Pull Request Reviewer Count/Total Developer Count",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -377,7 +377,7 @@
"text": "All",
"value": "$__all"
},
"datasource": "mysql",
"datasource": "default",
"definition": "select distinct concat(name, ': ', gitlab_id) from gitlab_projects",
"description": null,
"error": null,
Expand Down Expand Up @@ -405,4 +405,4 @@
"title": "Delivery Cost (require Gitlab data)",
"uid": "TV-BnpM7k",
"version": 7
}
}
36 changes: 18 additions & 18 deletions grafana/_archive/DeliveryQuality(RequireJiraAndGitlabData).json
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
"type": "text"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "1. Total number of Pull/Merge request created.\n2. The PR/MR being calculated are filtered by \"PR/MR creation time\" (time filter at the upper-right corner)",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -199,7 +199,7 @@
"type": "stat"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "1. Total number of Pull/Merge request merged.\n2. The PR/MR being calculated are filtered by \"PR/MR creation time\" (time filter at the upper-right corner)",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -277,7 +277,7 @@
"type": "stat"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "Pull Request Pass Count/Pull Request Count",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -359,7 +359,7 @@
"type": "stat"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "1. Pull Request Pass Rate over time.\n2. The time granularity can be switched to week or month by \"Time Interval\" above. \n3. When Time Interval is set to \"month\", value \"pull_request_pass_rate\" of \"2021-06-01\" calculates the PR/MR whose creation time falls under [2020-06-01, 2020-07-01)",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -466,7 +466,7 @@
"type": "timeseries"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "The average round of PR/MR review.",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -542,7 +542,7 @@
"type": "stat"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "1. Avg PR/MR Review Round over time.\n2. The time granularity can be switched to week or month by \"Time Interval\" above. \n3. When Time Interval is set to \"month\", value \"Avg Pull Request Review Round\" of \"2021-06-01\" calculates the PR/MR whose creation time falls under [2020-06-01, 2020-07-01)",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -649,7 +649,7 @@
"type": "timeseries"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "The average round of PR/MR review of PR authors.",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -741,7 +741,7 @@
"type": "barchart"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "One-time pass rate for PR over time.",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -867,7 +867,7 @@
"type": "text"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "1. Total number of bugs created.\n2. The bugs being calculated are filtered by \"bug creation time\" (time filter at the upper-right corner)",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -943,7 +943,7 @@
"type": "stat"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "1. Number of bugs created over time.\n2. The time granularity can be switched to week or month by \"Time Interval\" above. \n3. When Time Interval is set to \"month\", bug_count of \"2021-06-01\" calculates the bugs whose creation time falls under [2020-06-01, 2020-07-01)",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -1045,7 +1045,7 @@
"type": "timeseries"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "1. Total number of bugs found per 1,000 lines of code, including both added and deleted llines of code.\n2. The bugs being calculated are filtered by \"bug creation time\". The lines of code being calculated are filtered by \"commit creation time\" (both are affected by the time filter at the upper-right corner)",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -1130,7 +1130,7 @@
"type": "stat"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "1. Bug Count per 1k lines of code over time.\n2. When Time Interval is set to \"month\", bug_count_per_1k_LOC of \"2021-06-01\" calculates the bugs whose creation time falls under [2020-06-01, 2020-07-01) and lines of code whose commit creation time falls under [2020-06-01, 2020-07-01) ",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -1255,7 +1255,7 @@
"type": "text"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "1. Total number of incidents created.\n2. The incidents being calculated are filtered by \"incident creation time\" (time filter at the upper-right corner)",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -1331,7 +1331,7 @@
"type": "stat"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "1. Number of incidents created over time.\n2. The time granularity can be switched to week or month by \"Time Interval\" above. \n3. When Time Interval is set to \"month\", incident_count of \"2021-06-01\" calculates the incidents whose creation time falls under [2020-06-01, 2020-07-01)",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -1433,7 +1433,7 @@
"type": "timeseries"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "1. Total number of incidents found per 1,000 lines of code, including both added and deleted llines of code.\n2. The incidents being calculated are filtered by \"incident creation time\". The lines of code being calculated are filtered by \"commit creation time\" (both are affected by the time filter at the upper-right corner)",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -1518,7 +1518,7 @@
"type": "stat"
},
{
"datasource": "mysql",
"datasource": "default",
"description": "1. Incident Count per 1k lines of code over time.\n2. When Time Interval is set to \"month\", incident_count_per_1k_LOC of \"2021-06-01\" calculates the incidents whose creation time falls under [2020-06-01, 2020-07-01) and lines of code whose commit creation time falls under [2020-06-01, 2020-07-01) ",
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -1668,7 +1668,7 @@
"text": "All",
"value": "$__all"
},
"datasource": "mysql",
"datasource": "default",
"definition": "select distinct concat(name, ': ', board_id) from jira_boards",
"description": null,
"error": null,
Expand Down Expand Up @@ -1696,4 +1696,4 @@
"title": "Delivery Quality (require Jira and Gitlab data)",
"uid": "nUC-7tGnk",
"version": 14
}
}
Loading
Loading