更新 readme 和 grafana json

README.md

@@ -27,14 +27,14 @@ grafana 的配置在：./service_configs/admin_service/grafana/xxxx.json （根
 
 启动服务的命令：
 
-`docker-compose -f docker-compose-metrics.yml up -d --build --remove-orphans`
+`docker-compose -f docker-compose-metrics.yml up -d --build`
 
 
 ## 启动 Logging 相关服务
 
 启动服务的命令：
 
-`docker-compose -f docker-compose-logging.yml up -d --build --remove-orphans`
+`docker-compose -f docker-compose-logging.yml up -d --build`
 
 
 ## 启动 APISIX
@@ -42,7 +42,7 @@ grafana 的配置在：./service_configs/admin_service/grafana/xxxx.json （根
 
 启动服务的命令：
 
-`docker-compose -f docker-compose-apisix.yml up -d --build --remove-orphans`
+`docker-compose -f docker-compose-apisix.yml up -d --build`
 
 
 ## 启动 RabbitMQ
@@ -50,7 +50,7 @@ grafana 的配置在：./service_configs/admin_service/grafana/xxxx.json （根
 
 启动服务的命令：
 
-`docker-compose -f docker-compose-rabbitmq.yml up -d --build --remove-orphans`
+`docker-compose -f docker-compose-rabbitmq.yml up -d --build`
 
 
 ## 启动 Mysql
@@ -58,7 +58,7 @@ grafana 的配置在：./service_configs/admin_service/grafana/xxxx.json （根
 
 启动服务的命令：
 
-`docker-compose -f docker-compose-mysql.yml up -d --build --remove-orphans`
+`docker-compose -f docker-compose-mysql.yml up -d --build`
 
 
 

service_configs/admin_service/grafana/Admin Service.json

@@ -1,66 +1,51 @@
 {
-  "__inputs": [
-    {
-      "name": "Prometheus",
-      "label": "Prometheus",
-      "description": "",
-      "type": "datasource",
-      "pluginId": "prometheus",
-      "pluginName": "Prometheus"
-    }
-  ],
-  "__requires": [
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "4.6.2"
-    },
-    {
-      "type": "panel",
-      "id": "graph",
-      "name": "Graph",
-      "version": ""
-    },
-    {
-      "type": "datasource",
-      "id": "prometheus",
-      "name": "Prometheus",
-      "version": "1.0.0"
-    }
-  ],
   "annotations": {
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
         "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
         "type": "dashboard"
       }
     ]
   },
   "editable": true,
-  "gnetId": null,
+  "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "hideControls": false,
+  "id": 20,
-  "id": null,
   "links": [],
-  "refresh": false,
+  "liveNow": false,
-  "rows": [
-    {
-      "collapse": false,
-      "height": "250px",
   "panels": [
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-          "datasource": "${Prometheus}",
+      "datasource": {
+        "type": "prometheus",
+        "uid": "5qrwjFCnk"
+      },
       "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 12,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "hiddenSeries": false,
       "id": 5,
       "legend": {
         "alignAsTable": true,
@@ -79,69 +64,76 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
       "percentage": false,
+      "pluginVersion": "8.5.5",
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-          "span": 6,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-              "expr": "admin_service_hello",
+          "expr": "hello",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,
-              "legendFormat": "admin_service_hello {{quantile}}",
+          "legendFormat": "hello {{quantile}}",
           "refId": "A"
         }
       ],
       "thresholds": [],
-          "timeFrom": null,
+      "timeRegions": [],
-          "timeShift": null,
       "title": "Admin Service | Hello",
       "tooltip": {
         "shared": true,
         "sort": 0,
         "value_type": "individual"
       },
-          "transparent": false,
       "type": "graph",
       "xaxis": {
-            "buckets": null,
         "mode": "time",
-            "name": null,
         "show": true,
         "values": []
       },
       "yaxes": [
         {
           "format": "short",
-              "label": null,
           "logBase": 1,
-              "max": null,
-              "min": null,
           "show": true
         },
         {
           "format": "short",
-              "label": null,
           "logBase": 1,
-              "max": null,
-              "min": null,
           "show": true
         }
-          ]
+      ],
+      "yaxis": {
+        "align": false
+      }
     },
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-          "datasource": "${Prometheus}",
+      "datasource": {
+        "type": "prometheus",
+        "uid": "5qrwjFCnk"
+      },
       "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 12,
+        "w": 12,
+        "x": 12,
+        "y": 0
+      },
+      "hiddenSeries": false,
       "id": 10,
       "legend": {
         "alignAsTable": true,
@@ -157,27 +149,29 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
       "percentage": false,
+      "pluginVersion": "8.5.5",
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-          "span": 6,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-              "expr": "admin_service_error",
+          "expr": "error",
           "format": "time_series",
           "intervalFactor": 2,
-              "legendFormat": "admin_service_error {{quantile}}",
+          "legendFormat": "error {{quantile}}",
           "refId": "A"
         }
       ],
       "thresholds": [],
-          "timeFrom": null,
+      "timeRegions": [],
-          "timeShift": null,
       "title": "Admin Service | Error",
       "tooltip": {
         "shared": true,
@@ -186,41 +180,29 @@
       },
       "type": "graph",
       "xaxis": {
-            "buckets": null,
         "mode": "time",
-            "name": null,
         "show": true,
         "values": []
       },
       "yaxes": [
         {
           "format": "short",
-              "label": null,
           "logBase": 1,
-              "max": null,
-              "min": null,
           "show": true
         },
         {
           "format": "short",
-              "label": null,
           "logBase": 1,
-              "max": null,
-              "min": null,
           "show": true
         }
-          ]
+      ],
+      "yaxis": {
+        "align": false
+      }
     }
   ],
-      "repeat": null,
+  "refresh": "10s",
-      "repeatIteration": null,
+  "schemaVersion": 36,
-      "repeatRowId": null,
-      "showTitle": false,
-      "title": "Dashboard Row",
-      "titleSize": "h6"
-    }
-  ],
-  "schemaVersion": 14,
   "style": "dark",
   "tags": [],
   "templating": {
@@ -257,5 +239,7 @@
   },
   "timezone": "",
   "title": "Admin Service",
-  "version": 5
+  "uid": "ReKfE8Q4z",
+  "version": 2,
+  "weekStart": ""
 }