diff --git a/README.md b/README.md index e55ba1f..ab3beb2 100644 --- a/README.md +++ b/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` diff --git a/service_configs/admin_service/grafana/Admin Service.json b/service_configs/admin_service/grafana/Admin Service.json index 3a99fcb..364ead5 100644 --- a/service_configs/admin_service/grafana/Admin Service.json +++ b/service_configs/admin_service/grafana/Admin Service.json @@ -1,226 +1,208 @@ { - "__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": null, + "id": 20, "links": [], - "refresh": false, - "rows": [ + "liveNow": false, + "panels": [ { - "collapse": false, - "height": "250px", - "panels": [ + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "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, + "avg": true, + "current": true, + "hideEmpty": false, + "hideZero": false, + "max": true, + "min": true, + "rightSide": false, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "8.5.5", + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${Prometheus}", - "fill": 1, - "id": 5, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": false, - "hideZero": false, - "max": true, - "min": true, - "rightSide": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "span": 6, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "admin_service_hello", - "format": "time_series", - "hide": false, - "intervalFactor": 2, - "legendFormat": "admin_service_hello {{quantile}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "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 - } - ] - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${Prometheus}", - "fill": 1, - "id": 10, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "span": 6, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "admin_service_error", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "admin_service_error {{quantile}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "Admin Service | Error", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "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 - } - ] + "expr": "hello", + "format": "time_series", + "hide": false, + "intervalFactor": 2, + "legendFormat": "hello {{quantile}}", + "refId": "A" } ], - "repeat": null, - "repeatIteration": null, - "repeatRowId": null, - "showTitle": false, - "title": "Dashboard Row", - "titleSize": "h6" + "thresholds": [], + "timeRegions": [], + "title": "Admin Service | Hello", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "show": true + }, + { + "format": "short", + "logBase": 1, + "show": true + } + ], + "yaxis": { + "align": false + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "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, + "avg": true, + "current": true, + "max": true, + "min": true, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "8.5.5", + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "error", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "error {{quantile}}", + "refId": "A" + } + ], + "thresholds": [], + "timeRegions": [], + "title": "Admin Service | Error", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "show": true + }, + { + "format": "short", + "logBase": 1, + "show": true + } + ], + "yaxis": { + "align": false + } } ], - "schemaVersion": 14, + "refresh": "10s", + "schemaVersion": 36, "style": "dark", "tags": [], "templating": { @@ -257,5 +239,7 @@ }, "timezone": "", "title": "Admin Service", - "version": 5 + "uid": "ReKfE8Q4z", + "version": 2, + "weekStart": "" } \ No newline at end of file