IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

docker: change mysql container so that it uses utc

Browse Source
This commit is contained in:
Marcus Efraimsson
2018-04-10 16:59:48 +02:00
parent 6cb891dca8
commit be4b715aad
2 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
docker/blocks/mysql/dashboard.json
View File

@@ -2,7 +2,7 @@
"__inputs": [ "__inputs": [
{ {
"name": "DS_MYSQL", "name": "DS_MYSQL",
"label": "Mysql", "label": "MySQL",
"description": "", "description": "",
"type": "datasource", "type": "datasource",
"pluginId": "mysql", "pluginId": "mysql",
@@ -20,19 +20,19 @@
"type": "panel", "type": "panel",
"id": "graph", "id": "graph",
"name": "Graph", "name": "Graph",
"version": "" "version": "5.0.0"
}, },
{ {
"type": "datasource", "type": "datasource",
"id": "mysql", "id": "mysql",
"name": "MySQL", "name": "MySQL",
"version": "1.0.0" "version": "5.0.0"
}, },
{ {
"type": "panel", "type": "panel",
"id": "table", "id": "table",
"name": "Table", "name": "Table",
"version": "" "version": "5.0.0"
} }
], ],
"annotations": { "annotations": {
@@ -53,7 +53,7 @@
"gnetId": null, "gnetId": null,
"graphTooltip": 0, "graphTooltip": 0,
"id": null, "id": null,
"iteration": 1518602729468, "iteration": 1523372133566,
"links": [], "links": [],
"panels": [ "panels": [
{ {
@@ -118,7 +118,7 @@
], ],
"thresholds": [], "thresholds": [],
"timeFrom": null, "timeFrom": null,
"timeShift": "1h", "timeShift": null,
"title": "Average logins / $summarize", "title": "Average logins / $summarize",
"tooltip": { "tooltip": {
"shared": true, "shared": true,
@@ -150,7 +150,11 @@
"min": null, "min": null,
"show": true "show": true
} }
] ],
"yaxis": {
"align": false,
"alignLevel": null
}
}, },
{ {
"aliasColors": {}, "aliasColors": {},
@@ -204,7 +208,7 @@
], ],
"thresholds": [], "thresholds": [],
"timeFrom": null, "timeFrom": null,
"timeShift": "1h", "timeShift": null,
"title": "Average payments started/ended / $summarize", "title": "Average payments started/ended / $summarize",
"tooltip": { "tooltip": {
"shared": true, "shared": true,
@@ -236,7 +240,11 @@
"min": null, "min": null,
"show": true "show": true
} }
] ],
"yaxis": {
"align": false,
"alignLevel": null
}
}, },
{ {
"aliasColors": {}, "aliasColors": {},
@@ -284,7 +292,7 @@
], ],
"thresholds": [], "thresholds": [],
"timeFrom": null, "timeFrom": null,
"timeShift": "1h", "timeShift": null,
"title": "Max CPU / $summarize", "title": "Max CPU / $summarize",
"tooltip": { "tooltip": {
"shared": true, "shared": true,
@@ -316,7 +324,11 @@
"min": null, "min": null,
"show": true "show": true
} }
] ],
"yaxis": {
"align": false,
"alignLevel": null
}
}, },
{ {
"columns": [], "columns": [],
@@ -369,7 +381,7 @@
"target": "" "target": ""
} }
], ],
"timeShift": "1h", "timeShift": null,
"title": "Values", "title": "Values",
"transform": "table", "transform": "table",
"type": "table" "type": "table"
@@ -428,7 +440,6 @@
"auto_count": 5, "auto_count": 5,
"auto_min": "10s", "auto_min": "10s",
"current": { "current": {
"selected": true,
"text": "1m", "text": "1m",
"value": "1m" "value": "1m"
}, },
@@ -545,5 +556,5 @@
"timezone": "", "timezone": "",
"title": "Grafana Fake Data Gen - MySQL", "title": "Grafana Fake Data Gen - MySQL",
"uid": "DGsCac3kz", "uid": "DGsCac3kz",
"version": 6 "version": 8
} }

3
docker/blocks/mysql/docker-compose.yaml
View File

@@ -7,9 +7,6 @@
MYSQL_PASSWORD: password MYSQL_PASSWORD: password
ports: ports:
- "3306:3306" - "3306:3306"
volumes:
- /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci, --innodb_monitor_enable=all] command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci, --innodb_monitor_enable=all]
fake-mysql-data: fake-mysql-data: