fixed metrics

deployer/src/main/resources/logback.xml

@@ -79,7 +79,7 @@
 	</logger>
     
 	<root level="WARN">
-		<appender-ref ref="STDOUT"/>
+		<!-- <appender-ref ref="STDOUT"/> -->
 		<appender-ref ref="CANAL-ROOT" />
 	</root>
 </configuration>

deployer/src/main/resources/metrics/Canal_instances_tmpl.json

@@ -1,34 +1,4 @@
 {
-  "__inputs": [
-    {
-      "name": "DS_PROMETHEUS",
-      "label": "prometheus",
-      "description": "",
-      "type": "datasource",
-      "pluginId": "prometheus",
-      "pluginName": "Prometheus"
-    }
-  ],
-  "__requires": [
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "5.2.2"
-    },
-    {
-      "type": "panel",
-      "id": "graph",
-      "name": "Graph",
-      "version": "5.0.0"
-    },
-    {
-      "type": "datasource",
-      "id": "prometheus",
-      "name": "Prometheus",
-      "version": "5.0.0"
-    }
-  ],
   "annotations": {
     "list": [
       {
@@ -45,8 +15,8 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "id": null,
-  "iteration": 1534723196501,
+  "id": 8,
+  "iteration": 1534740332233,
   "links": [],
   "panels": [
     {
@@ -495,7 +465,7 @@
       },
       "id": 32,
       "panels": [],
-      "title": "Throughput",
+      "title": "Server",
       "type": "row"
     },
     {
@@ -690,34 +660,21 @@
         "alignLevel": null
       }
     },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 12
-      },
-      "id": 34,
-      "panels": [],
-      "title": "Client",
-      "type": "row"
-    },
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": "$datasource",
-      "description": "Canal instance接收到的请求统计，结果按packet type分类。",
+      "description": "Canal instance ringbuffer内未释放的events数量。",
       "fill": 1,
       "gridPos": {
         "h": 5,
         "w": 6,
-        "x": 0,
-        "y": 13
+        "x": 12,
+        "y": 7
       },
-      "id": 16,
+      "id": 20,
       "legend": {
         "avg": false,
         "current": false,
@@ -741,18 +698,18 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "canal_instance_client_packets{destination=~\"$destination\"}",
+          "expr": "canal_instance_store_produce_seq{destination=~\"$destination\"} - canal_instance_store_consume_seq{destination=~\"$destination\"}",
           "format": "time_series",
           "interval": "15s",
           "intervalFactor": 2,
-          "legendFormat": "{{packetType}}",
+          "legendFormat": "events",
           "refId": "A"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Client requests",
+      "title": "Store remain events",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -768,14 +725,16 @@
       },
       "yaxes": [
         {
+          "decimals": null,
           "format": "none",
-          "label": null,
+          "label": "",
           "logBase": 1,
           "max": null,
           "min": null,
           "show": true
         },
         {
+          "decimals": null,
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -794,16 +753,16 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
-      "description": "client 请求的GET与ACK包的QPS。",
+      "datasource": "$datasource",
+      "description": "Canal instance ringbuffer 内未释放events占用内存。",
       "fill": 1,
       "gridPos": {
         "h": 5,
         "w": 6,
-        "x": 6,
-        "y": 13
+        "x": 18,
+        "y": 7
       },
-      "id": 38,
+      "id": 22,
       "legend": {
         "avg": false,
         "current": false,
@@ -827,26 +786,18 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(canal_instance_client_packets{destination=~\"$destination\",packetType=\"GET\"}[2m])",
+          "expr": "(canal_instance_store_produce_mem{destination=~\"$destination\"} - canal_instance_store_consume_mem{destination=~\"$destination\"}) / 1024",
           "format": "time_series",
           "interval": "15s",
           "intervalFactor": 2,
-          "legendFormat": "GET",
+          "legendFormat": "memsize",
           "refId": "A"
-        },
-        {
-          "expr": "rate(canal_instance_client_packets{destination=~\"$destination\",packetType=\"CLIENTACK\"}[2m])",
-          "format": "time_series",
-          "interval": "15s",
-          "intervalFactor": 2,
-          "legendFormat": "ACK",
-          "refId": "B"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Client QPS",
+      "title": "Store remain mem",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -862,7 +813,7 @@
       },
       "yaxes": [
         {
-          "format": "short",
+          "format": "deckbytes",
           "label": null,
           "logBase": 1,
           "max": null,
@@ -883,21 +834,34 @@
         "alignLevel": null
       }
     },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 12
+      },
+      "id": 34,
+      "panels": [],
+      "title": "Client",
+      "type": "row"
+    },
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": "$datasource",
-      "description": "server响应GET请求，但返回空包的占比。",
+      "description": "Canal instance接收到的请求统计，结果按packet type分类。",
       "fill": 1,
       "gridPos": {
         "h": 5,
         "w": 6,
-        "x": 12,
+        "x": 0,
         "y": 13
       },
-      "id": 26,
+      "id": 16,
       "legend": {
         "avg": false,
         "current": false,
@@ -921,25 +885,18 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(canal_instance_client_empty_batches{destination=~\"$destination\"}[2m])",
+          "expr": "canal_instance_client_packets{destination=~\"$destination\"}",
           "format": "time_series",
           "interval": "15s",
           "intervalFactor": 2,
-          "legendFormat": "empty",
+          "legendFormat": "{{packetType}}",
           "refId": "A"
-        },
-        {
-          "expr": "rate(canal_instance_client_packets{destination=~\"$destination\", packetType=\"GET\"}[2m])",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "nonempty",
-          "refId": "B"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Empty packets",
+      "title": "Client requests",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -955,7 +912,7 @@
       },
       "yaxes": [
         {
-          "format": "wps",
+          "format": "none",
           "label": null,
           "logBase": 1,
           "max": null,
@@ -981,23 +938,21 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "$datasource",
-      "description": "Canal client 请求响应时间的概况。",
+      "datasource": "Prometheus",
+      "description": "client 请求的GET与ACK包的QPS。",
       "fill": 1,
       "gridPos": {
         "h": 5,
         "w": 6,
-        "x": 18,
+        "x": 6,
         "y": 13
       },
-      "id": 18,
+      "id": 38,
       "legend": {
-        "alignAsTable": false,
         "avg": false,
         "current": false,
         "max": false,
         "min": false,
-        "rightSide": false,
         "show": true,
         "total": false,
         "values": false
@@ -1010,40 +965,37 @@
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "25.0",
-          "yaxis": 1
-        },
-        {
-          "alias": "100.0",
-          "yaxis": 1
-        }
-      ],
+      "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(canal_instance_client_request_latency_bucket{destination=~\"$destination\"}[2m])",
+          "expr": "rate(canal_instance_client_packets{destination=~\"$destination\",packetType=\"GET\"}[2m])",
           "format": "time_series",
-          "hide": false,
           "interval": "15s",
           "intervalFactor": 2,
-          "legendFormat": "{{le}}ms",
+          "legendFormat": "GET",
           "refId": "A"
+        },
+        {
+          "expr": "rate(canal_instance_client_packets{destination=~\"$destination\",packetType=\"CLIENTACK\"}[2m])",
+          "format": "time_series",
+          "interval": "15s",
+          "intervalFactor": 2,
+          "legendFormat": "ACK",
+          "refId": "B"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Response time",
+      "title": "Client QPS",
       "tooltip": {
         "shared": true,
         "sort": 0,
         "value_type": "individual"
       },
-      "transparent": false,
       "type": "graph",
       "xaxis": {
         "buckets": null,
@@ -1075,34 +1027,21 @@
         "alignLevel": null
       }
     },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 18
-      },
-      "id": 36,
-      "panels": [],
-      "title": "Store",
-      "type": "row"
-    },
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": "$datasource",
-      "description": "Canal instance ringbuffer内未释放的events数量。",
+      "description": "server响应GET请求，但返回空包的占比。",
       "fill": 1,
       "gridPos": {
         "h": 5,
         "w": 6,
-        "x": 0,
-        "y": 19
+        "x": 12,
+        "y": 13
       },
-      "id": 20,
+      "id": 26,
       "legend": {
         "avg": false,
         "current": false,
@@ -1126,18 +1065,25 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "canal_instance_store_produce_seq{destination=~\"$destination\"} - canal_instance_store_consume_seq{destination=~\"$destination\"}",
+          "expr": "rate(canal_instance_client_empty_batches{destination=~\"$destination\"}[2m])",
           "format": "time_series",
           "interval": "15s",
           "intervalFactor": 2,
-          "legendFormat": "events",
+          "legendFormat": "empty",
           "refId": "A"
+        },
+        {
+          "expr": "rate(canal_instance_client_packets{destination=~\"$destination\", packetType=\"GET\"}[2m])",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "legendFormat": "nonempty",
+          "refId": "B"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Store remain events",
+      "title": "Empty packets",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -1153,16 +1099,14 @@
       },
       "yaxes": [
         {
-          "decimals": null,
-          "format": "none",
-          "label": "",
+          "format": "wps",
+          "label": null,
           "logBase": 1,
           "max": null,
           "min": null,
           "show": true
         },
         {
-          "decimals": null,
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -1182,20 +1126,22 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$datasource",
-      "description": "Canal instance ringbuffer 内未释放events占用内存。",
+      "description": "Canal client 请求响应时间的概况。",
       "fill": 1,
       "gridPos": {
         "h": 5,
         "w": 6,
-        "x": 6,
-        "y": 19
+        "x": 18,
+        "y": 13
       },
-      "id": 22,
+      "id": 18,
       "legend": {
+        "alignAsTable": false,
         "avg": false,
         "current": false,
         "max": false,
         "min": false,
+        "rightSide": false,
         "show": true,
         "total": false,
         "values": false
@@ -1208,29 +1154,40 @@
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [],
+      "seriesOverrides": [
+        {
+          "alias": "25.0",
+          "yaxis": 1
+        },
+        {
+          "alias": "100.0",
+          "yaxis": 1
+        }
+      ],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "(canal_instance_store_produce_mem{destination=~\"$destination\"} - canal_instance_store_consume_mem{destination=~\"$destination\"}) / 1024",
+          "expr": "rate(canal_instance_client_request_latency_bucket{destination=~\"$destination\"}[2m])",
           "format": "time_series",
+          "hide": false,
           "interval": "15s",
           "intervalFactor": 2,
-          "legendFormat": "memsize",
+          "legendFormat": "{{le}}ms",
           "refId": "A"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Store remain mem",
+      "title": "Response time",
       "tooltip": {
         "shared": true,
         "sort": 0,
         "value_type": "individual"
       },
+      "transparent": false,
       "type": "graph",
       "xaxis": {
         "buckets": null,
@@ -1241,7 +1198,7 @@
       },
       "yaxes": [
         {
-          "format": "deckbytes",
+          "format": "short",
           "label": null,
           "logBase": 1,
           "max": null,
@@ -1273,8 +1230,9 @@
     "list": [
       {
         "current": {
-          "text": "prometheus",
-          "value": "prometheus"
+          "tags": [],
+          "text": "Prometheus",
+          "value": "Prometheus"
         },
         "hide": 0,
         "label": "datasource",
@@ -1287,7 +1245,10 @@
       },
       {
         "allValue": null,
-        "current": {},
+        "current": {
+          "text": "example",
+          "value": "example"
+        },
         "datasource": "$datasource",
         "hide": 0,
         "includeAll": false,
@@ -1308,7 +1269,7 @@
     ]
   },
   "time": {
-    "from": "now-6h",
+    "from": "now-1h",
     "to": "now"
   },
   "timepicker": {
@@ -1339,5 +1300,5 @@
   "timezone": "",
   "title": "Canal instances",
   "uid": "8vh8NGpiz",
-  "version": 97
+  "version": 1
 }