瀏覽代碼

docker: change mysql container so that it uses utc

Marcus Efraimsson 7 年之前
父節點
當前提交
be4b715aad
共有 2 個文件被更改,包括 25 次插入17 次删除
  1. 25 14
      docker/blocks/mysql/dashboard.json
  2. 0 3
      docker/blocks/mysql/docker-compose.yaml

+ 25 - 14
docker/blocks/mysql/dashboard.json

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

+ 0 - 3
docker/blocks/mysql/docker-compose.yaml

@@ -7,9 +7,6 @@
       MYSQL_PASSWORD: password
     ports:
       - "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]
 
   fake-mysql-data: