You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by sp...@apache.org on 2021/01/24 12:04:45 UTC
[apisix] branch master updated: fix: update example grafana to
lastest prometheus support (#3402)
This is an automated email from the ASF dual-hosted git repository.
spacewander pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new 1819b6b fix: update example grafana to lastest prometheus support (#3402)
1819b6b is described below
commit 1819b6b524cce370b41d7bf656f0d9d9f716fc08
Author: Shuyang Wu <wo...@gmail.com>
AuthorDate: Sun Jan 24 20:04:33 2021 +0800
fix: update example grafana to lastest prometheus support (#3402)
---
doc/json/apisix-grafana-dashboard.json | 714 +++++++++++++++++++++++++++++----
doc/plugins/prometheus.md | 19 +-
doc/zh-cn/plugins/prometheus.md | 17 +-
3 files changed, 660 insertions(+), 90 deletions(-)
diff --git a/doc/json/apisix-grafana-dashboard.json b/doc/json/apisix-grafana-dashboard.json
index c81088f..62503d1 100644
--- a/doc/json/apisix-grafana-dashboard.json
+++ b/doc/json/apisix-grafana-dashboard.json
@@ -1,45 +1,9 @@
{
- "__inputs": [
- {
- "name": "DS_PROMETHEUS",
- "label": "Prometheus",
- "description": "",
- "type": "datasource",
- "pluginId": "prometheus",
- "pluginName": "Prometheus"
- }
- ],
- "__requires": [
- {
- "type": "grafana",
- "id": "grafana",
- "name": "Grafana",
- "version": "6.5.3"
- },
- {
- "type": "panel",
- "id": "graph",
- "name": "Graph",
- "version": ""
- },
- {
- "type": "datasource",
- "id": "prometheus",
- "name": "Prometheus",
- "version": "1.0.0"
- },
- {
- "type": "panel",
- "id": "singlestat",
- "name": "Singlestat",
- "version": ""
- }
- ],
"annotations": {
"list": [
{
"builtIn": 1,
- "datasource": "${DS_PROMETHEUS}",
+ "datasource": "Prometheus",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
@@ -50,16 +14,17 @@
}
]
},
+ "description": "MicroService API Gateway Apache APISIX",
"editable": true,
"gnetId": 11719,
"graphTooltip": 0,
- "id": null,
- "iteration": 1581393561230,
+ "id": 1,
+ "iteration": 1611470459709,
"links": [],
"panels": [
{
"collapsed": false,
- "datasource": "${DS_PROMETHEUS}",
+ "datasource": "Prometheus",
"gridPos": {
"h": 1,
"w": 24,
@@ -80,8 +45,14 @@
"rgba(237, 129, 40, 0.89)",
"#d44a3a"
],
- "datasource": "${DS_PROMETHEUS}",
+ "datasource": "Prometheus",
"description": "",
+ "fieldConfig": {
+ "defaults": {
+ "custom": {}
+ },
+ "overrides": []
+ },
"format": "none",
"gauge": {
"maxValue": 100,
@@ -113,7 +84,6 @@
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
- "options": {},
"postfix": "",
"postfixFontSize": "50%",
"prefix": "",
@@ -166,8 +136,14 @@
"rgba(237, 129, 40, 0.89)",
"#d44a3a"
],
- "datasource": "${DS_PROMETHEUS}",
+ "datasource": "Prometheus",
"description": "",
+ "fieldConfig": {
+ "defaults": {
+ "custom": {}
+ },
+ "overrides": []
+ },
"format": "none",
"gauge": {
"maxValue": 100,
@@ -199,7 +175,6 @@
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
- "options": {},
"postfix": "",
"postfixFontSize": "50%",
"prefix": "",
@@ -252,8 +227,14 @@
"rgba(237, 129, 40, 0.89)",
"#d44a3a"
],
- "datasource": "${DS_PROMETHEUS}",
+ "datasource": "Prometheus",
"description": "",
+ "fieldConfig": {
+ "defaults": {
+ "custom": {}
+ },
+ "overrides": []
+ },
"format": "none",
"gauge": {
"maxValue": 100,
@@ -285,7 +266,6 @@
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
- "options": {},
"postfix": "",
"postfixFontSize": "50%",
"prefix": "",
@@ -334,7 +314,14 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "datasource": "${DS_PROMETHEUS}",
+ "datasource": "Prometheus",
+ "fieldConfig": {
+ "defaults": {
+ "custom": {},
+ "links": []
+ },
+ "overrides": []
+ },
"fill": 1,
"fillGradient": 0,
"gridPos": {
@@ -360,9 +347,10 @@
"linewidth": 1,
"nullPointMode": "null",
"options": {
- "dataLinks": []
+ "alertThreshold": true
},
"percentage": false,
+ "pluginVersion": "7.3.7",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -373,6 +361,7 @@
"targets": [
{
"expr": "sum(apisix_nginx_http_current_connections{state=~\"active|reading|writing|waiting\", instance=~\"$instance\"}) by (state)",
+ "interval": "",
"intervalFactor": 1,
"legendFormat": "{{state}}",
"refId": "A"
@@ -398,16 +387,18 @@
},
"yaxes": [
{
+ "decimals": 0,
"format": "short",
- "label": null,
+ "label": "",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
+ "decimals": null,
"format": "short",
- "label": null,
+ "label": "",
"logBase": 1,
"max": null,
"min": null,
@@ -421,7 +412,7 @@
},
{
"collapsed": false,
- "datasource": "${DS_PROMETHEUS}",
+ "datasource": "Prometheus",
"gridPos": {
"h": 1,
"w": 24,
@@ -438,7 +429,14 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "datasource": "${DS_PROMETHEUS}",
+ "datasource": "Prometheus",
+ "fieldConfig": {
+ "defaults": {
+ "custom": {},
+ "links": []
+ },
+ "overrides": []
+ },
"fill": 1,
"fillGradient": 0,
"gridPos": {
@@ -464,9 +462,10 @@
"linewidth": 1,
"nullPointMode": "null",
"options": {
- "dataLinks": []
+ "alertThreshold": true
},
"percentage": false,
+ "pluginVersion": "7.3.7",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -476,7 +475,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "sum(rate(apisix_bandwidth{instance=~\"$instance\"}[1m])) by (type)",
+ "expr": "sum(rate(apisix_bandwidth{instance=~\"$instance\"}[30s])) by (type)",
"legendFormat": "{{type}}",
"refId": "A"
}
@@ -501,11 +500,12 @@
},
"yaxes": [
{
+ "decimals": 0,
"format": "short",
"label": null,
"logBase": 1,
"max": null,
- "min": null,
+ "min": "0",
"show": true
},
{
@@ -527,7 +527,14 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "datasource": "${DS_PROMETHEUS}",
+ "datasource": "Prometheus",
+ "fieldConfig": {
+ "defaults": {
+ "custom": {},
+ "links": []
+ },
+ "overrides": []
+ },
"fill": 1,
"fillGradient": 0,
"gridPos": {
@@ -551,9 +558,10 @@
"linewidth": 1,
"nullPointMode": "null",
"options": {
- "dataLinks": []
+ "alertThreshold": true
},
"percentage": false,
+ "pluginVersion": "7.3.7",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -593,11 +601,12 @@
},
"yaxes": [
{
+ "decimals": 0,
"format": "short",
"label": null,
"logBase": 1,
"max": null,
- "min": null,
+ "min": "0",
"show": true
},
{
@@ -619,7 +628,14 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "datasource": "${DS_PROMETHEUS}",
+ "datasource": "Prometheus",
+ "fieldConfig": {
+ "defaults": {
+ "custom": {},
+ "links": []
+ },
+ "overrides": []
+ },
"fill": 1,
"fillGradient": 0,
"gridPos": {
@@ -643,9 +659,10 @@
"linewidth": 1,
"nullPointMode": "null",
"options": {
- "dataLinks": []
+ "alertThreshold": true
},
"percentage": false,
+ "pluginVersion": "7.3.7",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -685,11 +702,12 @@
},
"yaxes": [
{
+ "decimals": 0,
"format": "short",
"label": null,
"logBase": 1,
"max": null,
- "min": null,
+ "min": "0",
"show": true
},
{
@@ -708,7 +726,7 @@
},
{
"collapsed": false,
- "datasource": "${DS_PROMETHEUS}",
+ "datasource": "Prometheus",
"gridPos": {
"h": 1,
"w": 24,
@@ -717,23 +735,143 @@
},
"id": 15,
"panels": [],
- "title": "HTTP Status",
+ "title": "HTTP",
"type": "row"
},
{
+ "datasource": null,
+ "fieldConfig": {
+ "defaults": {
+ "custom": {},
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 80
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 6,
+ "w": 23,
+ "x": 0,
+ "y": 26
+ },
+ "id": 27,
+ "options": {
+ "displayMode": "gradient",
+ "orientation": "auto",
+ "reduceOptions": {
+ "calcs": [
+ "last"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showUnfilled": true
+ },
+ "pluginVersion": "7.3.7",
+ "targets": [
+ {
+ "expr": "sum(apisix_http_latency_bucket{service=~\"$service\",consumer=~\"$consumer\",node=~\"$node\"}) by (le)",
+ "format": "heatmap",
+ "interval": "",
+ "legendFormat": "{{le}}",
+ "refId": "A"
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "HTTP Latency",
+ "type": "bargauge"
+ },
+ {
+ "datasource": null,
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "custom": {},
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 80
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 6,
+ "w": 23,
+ "x": 0,
+ "y": 32
+ },
+ "id": 28,
+ "options": {
+ "displayMode": "gradient",
+ "orientation": "auto",
+ "reduceOptions": {
+ "calcs": [
+ "last"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showUnfilled": true
+ },
+ "pluginVersion": "7.3.7",
+ "targets": [
+ {
+ "expr": "sum(apisix_http_overhead_bucket{service=~\"$service\",consumer=~\"$consumer\",node=~\"$node\"}) by (le)",
+ "format": "heatmap",
+ "interval": "",
+ "legendFormat": "{{le}}",
+ "refId": "A"
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "HTTP Overhead",
+ "type": "bargauge"
+ },
+ {
"aliasColors": {},
"bars": false,
"cacheTimeout": null,
"dashLength": 10,
"dashes": false,
- "datasource": "${DS_PROMETHEUS}",
+ "datasource": "Prometheus",
+ "fieldConfig": {
+ "defaults": {
+ "custom": {},
+ "links": []
+ },
+ "overrides": []
+ },
"fill": 3,
"fillGradient": 0,
"gridPos": {
"h": 6,
"w": 15,
"x": 0,
- "y": 26
+ "y": 38
},
"hiddenSeries": false,
"id": 2,
@@ -752,10 +890,10 @@
"links": [],
"nullPointMode": "null",
"options": {
- "dataLinks": []
+ "alertThreshold": true
},
"percentage": false,
- "pluginVersion": "6.5.2",
+ "pluginVersion": "7.3.7",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -770,25 +908,29 @@
"steppedLine": false,
"targets": [
{
- "expr": "sum(rate(apisix_http_status{code=~\"2..\",service=~\"$service\",route=~\"$route\",instance=~\"$instance\"}[1m])) by (status_2xx)",
+ "expr": "sum(rate(apisix_http_status{code=~\"2..\",service=~\"$service\",route=~\"$route\",instance=~\"$instance\"}[30s])) by (status_2xx)",
"instant": false,
+ "interval": "",
"intervalFactor": 1,
"legendFormat": "status_2xx",
"refId": "A"
},
{
- "expr": "sum(rate(apisix_http_status{code=~\"3..\",service=~\"$service\",route=~\"$route\",instance=~\"$instance\"}[1m])) by (status_3xx)",
+ "expr": "sum(rate(apisix_http_status{code=~\"3..\",service=~\"$service\",route=~\"$route\",instance=~\"$instance\"}[30s])) by (status_3xx)",
+ "interval": "",
"legendFormat": "status_3xx",
"refId": "D"
},
{
- "expr": "sum(rate(apisix_http_status{code=~\"4..\",service=~\"$service\",route=~\"$route\",instance=~\"$instance\"}[1m])) by (status_4xx)",
+ "expr": "sum(rate(apisix_http_status{code=~\"4..\",service=~\"$service\",route=~\"$route\",instance=~\"$instance\"}[30s])) by (status_4xx)",
+ "interval": "",
"intervalFactor": 1,
"legendFormat": "status_4xx",
"refId": "B"
},
{
- "expr": "sum(rate(apisix_http_status{code=~\"5..\",service=~\"$service\",route=~\"$route\",instance=~\"$instance\"}[1m])) by (status_5xx)",
+ "expr": "sum(rate(apisix_http_status{code=~\"5..\",service=~\"$service\",route=~\"$route\",instance=~\"$instance\"}[30s])) by (status_5xx)",
+ "interval": "",
"legendFormat": "status_5xx",
"refId": "C"
}
@@ -813,11 +955,12 @@
},
"yaxes": [
{
+ "decimals": 0,
"format": "short",
"label": null,
"logBase": 1,
"max": null,
- "min": null,
+ "min": "0",
"show": true
},
{
@@ -833,19 +976,358 @@
"align": false,
"alignLevel": null
}
+ },
+ {
+ "collapsed": false,
+ "datasource": null,
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 44
+ },
+ "id": 23,
+ "panels": [],
+ "title": "Misc",
+ "type": "row"
+ },
+ {
+ "datasource": null,
+ "fieldConfig": {
+ "defaults": {
+ "custom": {},
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 0
+ },
+ {
+ "color": "green",
+ "value": 1
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 5,
+ "w": 3,
+ "x": 0,
+ "y": 45
+ },
+ "id": 25,
+ "options": {
+ "colorMode": "value",
+ "graphMode": "area",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "reduceOptions": {
+ "calcs": [
+ "last"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "textMode": "auto"
+ },
+ "pluginVersion": "7.3.7",
+ "targets": [
+ {
+ "expr": "sum(apisix_etcd_reachable{instance=~\"$instance\"})",
+ "interval": "",
+ "legendFormat": "",
+ "refId": "A"
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Etcd reachable",
+ "type": "stat"
+ },
+ {
+ "datasource": null,
+ "fieldConfig": {
+ "defaults": {
+ "custom": {},
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "yellow",
+ "value": 1
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 5,
+ "w": 3,
+ "x": 3,
+ "y": 45
+ },
+ "id": 29,
+ "options": {
+ "colorMode": "value",
+ "graphMode": "area",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "reduceOptions": {
+ "calcs": [
+ "last"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "textMode": "auto"
+ },
+ "pluginVersion": "7.3.7",
+ "targets": [
+ {
+ "expr": "sum(apisix_nginx_metric_errors_total{instance=~\"$instance\"})",
+ "interval": "",
+ "legendFormat": "",
+ "refId": "A"
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Nginx metric errors",
+ "type": "stat"
+ },
+ {
+ "aliasColors": {},
+ "bars": false,
+ "dashLength": 10,
+ "dashes": false,
+ "datasource": "Prometheus",
+ "fieldConfig": {
+ "defaults": {
+ "custom": {},
+ "links": []
+ },
+ "overrides": []
+ },
+ "fill": 1,
+ "fillGradient": 0,
+ "gridPos": {
+ "h": 6,
+ "w": 15,
+ "x": 0,
+ "y": 50
+ },
+ "hiddenSeries": false,
+ "id": 30,
+ "legend": {
+ "alignAsTable": false,
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "rightSide": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 1,
+ "nullPointMode": "null",
+ "options": {
+ "alertThreshold": true
+ },
+ "percentage": false,
+ "pluginVersion": "7.3.7",
+ "pointradius": 2,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "spaceLength": 10,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "expr": "sum(apisix_etcd_modify_indexes{key=~\"consumers|global_rules|max_modify_index|prev_index|protos|routes|services|ssls|stream_routes|upstreams|x_etcd_index\"}) by (key)",
+ "interval": "",
+ "intervalFactor": 1,
+ "legendFormat": "{{key}}",
+ "refId": "A"
+ }
+ ],
+ "thresholds": [],
+ "timeFrom": null,
+ "timeRegions": [],
+ "timeShift": null,
+ "title": "Etcd modify indexes",
+ "tooltip": {
+ "shared": true,
+ "sort": 0,
+ "value_type": "individual"
+ },
+ "type": "graph",
+ "xaxis": {
+ "buckets": null,
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
+ },
+ "yaxes": [
+ {
+ "decimals": 0,
+ "format": "short",
+ "label": "",
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "decimals": null,
+ "format": "short",
+ "label": "",
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ],
+ "yaxis": {
+ "align": false,
+ "alignLevel": null
+ }
+ },
+ {
+ "aliasColors": {},
+ "bars": false,
+ "dashLength": 10,
+ "dashes": false,
+ "datasource": "Prometheus",
+ "fieldConfig": {
+ "defaults": {
+ "custom": {},
+ "links": []
+ },
+ "overrides": []
+ },
+ "fill": 1,
+ "fillGradient": 0,
+ "gridPos": {
+ "h": 6,
+ "w": 15,
+ "x": 0,
+ "y": 56
+ },
+ "hiddenSeries": false,
+ "id": 31,
+ "legend": {
+ "alignAsTable": false,
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "rightSide": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 1,
+ "nullPointMode": "null",
+ "options": {
+ "alertThreshold": true
+ },
+ "percentage": false,
+ "pluginVersion": "7.3.7",
+ "pointradius": 2,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "spaceLength": 10,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "expr": "sum(apisix_batch_process_entries{name=~\"sys-logger|http-logger|sls-logger|tcp-logger|udp-logger|zipkin\"}) by (name)",
+ "interval": "",
+ "intervalFactor": 1,
+ "legendFormat": "{{name}}",
+ "refId": "A"
+ }
+ ],
+ "thresholds": [],
+ "timeFrom": null,
+ "timeRegions": [],
+ "timeShift": null,
+ "title": "Batch process entries",
+ "tooltip": {
+ "shared": true,
+ "sort": 0,
+ "value_type": "individual"
+ },
+ "type": "graph",
+ "xaxis": {
+ "buckets": null,
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
+ },
+ "yaxes": [
+ {
+ "decimals": 0,
+ "format": "short",
+ "label": "",
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "decimals": null,
+ "format": "short",
+ "label": "",
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ],
+ "yaxis": {
+ "align": false,
+ "alignLevel": null
+ }
}
],
"refresh": "5s",
- "schemaVersion": 21,
+ "schemaVersion": 26,
"style": "dark",
"tags": [],
"templating": {
"list": [
{
"allValue": ".*",
- "current": {},
- "datasource": "${DS_PROMETHEUS}",
+ "current": {
+ "selected": false,
+ "text": "All",
+ "value": "$__all"
+ },
+ "datasource": "Prometheus",
"definition": "label_values(apisix_http_status,service)",
+ "error": null,
"hide": 0,
"includeAll": true,
"label": null,
@@ -853,7 +1335,7 @@
"name": "service",
"options": [],
"query": "label_values(apisix_http_status,service)",
- "refresh": 1,
+ "refresh": 2,
"regex": "",
"skipUrlSync": false,
"sort": 1,
@@ -865,9 +1347,14 @@
},
{
"allValue": ".*",
- "current": {},
- "datasource": "${DS_PROMETHEUS}",
+ "current": {
+ "selected": false,
+ "text": "All",
+ "value": "$__all"
+ },
+ "datasource": "Prometheus",
"definition": "label_values(apisix_http_status,route)",
+ "error": null,
"hide": 0,
"includeAll": true,
"label": null,
@@ -875,7 +1362,7 @@
"name": "route",
"options": [],
"query": "label_values(apisix_http_status,route)",
- "refresh": 1,
+ "refresh": 2,
"regex": "",
"skipUrlSync": false,
"sort": 1,
@@ -887,9 +1374,14 @@
},
{
"allValue": ".*",
- "current": {},
- "datasource": "${DS_PROMETHEUS}",
+ "current": {
+ "selected": false,
+ "text": "All",
+ "value": "$__all"
+ },
+ "datasource": "Prometheus",
"definition": "label_values(apisix_http_status,instance)",
+ "error": null,
"hide": 0,
"includeAll": true,
"label": null,
@@ -906,6 +1398,60 @@
"tagsQuery": "",
"type": "query",
"useTags": false
+ },
+ {
+ "allValue": ".*",
+ "current": {
+ "selected": false,
+ "text": "All",
+ "value": "$__all"
+ },
+ "datasource": "Prometheus",
+ "definition": "label_values(apisix_http_status,consumer)",
+ "error": null,
+ "hide": 0,
+ "includeAll": true,
+ "label": null,
+ "multi": true,
+ "name": "consumer",
+ "options": [],
+ "query": "label_values(apisix_http_status,consumer)",
+ "refresh": 2,
+ "regex": ".*",
+ "skipUrlSync": false,
+ "sort": 1,
+ "tagValuesQuery": "",
+ "tags": [],
+ "tagsQuery": "",
+ "type": "query",
+ "useTags": false
+ },
+ {
+ "allValue": ".*",
+ "current": {
+ "selected": false,
+ "text": "All",
+ "value": "$__all"
+ },
+ "datasource": "Prometheus",
+ "definition": "label_values(apisix_http_status,node)",
+ "error": null,
+ "hide": 0,
+ "includeAll": true,
+ "label": null,
+ "multi": true,
+ "name": "node",
+ "options": [],
+ "query": "label_values(apisix_http_status,node)",
+ "refresh": 2,
+ "regex": "",
+ "skipUrlSync": false,
+ "sort": 1,
+ "tagValuesQuery": "",
+ "tags": [],
+ "tagsQuery": "",
+ "type": "query",
+ "useTags": false
}
]
},
@@ -930,7 +1476,5 @@
"timezone": "",
"title": "Apache APISIX",
"uid": "bLlNuRLWz",
- "version": 49,
- "description": "MicroService API Gateway Apache APISIX"
-}
-
+ "version": 4
+}
\ No newline at end of file
diff --git a/doc/plugins/prometheus.md b/doc/plugins/prometheus.md
index 4387348..15f4078 100644
--- a/doc/plugins/prometheus.md
+++ b/doc/plugins/prometheus.md
@@ -94,9 +94,9 @@ And we can check the status at prometheus console:
We can change the default export uri in the `plugin_attr` section of `conf/config.yaml`.
-| Name | Type | Default | Description |
-| ------------ | ------ | -------- | -------------------------------------------------------------------- |
-| export_uri | string | "/apisix/prometheus/metrics" | uri to get the prometheus metrics |
+| Name | Type | Default | Description |
+| ---------- | ------ | ---------------------------- | --------------------------------- |
+| export_uri | string | "/apisix/prometheus/metrics" | uri to get the prometheus metrics |
Here is an example:
@@ -142,6 +142,19 @@ apisix_bandwidth{type="egress",service="foo.com"} 2379
apisix_bandwidth{type="ingress",service="127.0.0.2"} 83
apisix_bandwidth{type="ingress",service="bar.com"} 76
apisix_bandwidth{type="ingress",service="foo.com"} 988
+# HELP apisix_etcd_modify_indexes Etcd modify index for APISIX keys
+# TYPE apisix_etcd_modify_indexes gauge
+apisix_etcd_modify_indexes{key="consumers"} 0
+apisix_etcd_modify_indexes{key="global_rules"} 0
+apisix_etcd_modify_indexes{key="max_modify_index"} 222
+apisix_etcd_modify_indexes{key="prev_index"} 35
+apisix_etcd_modify_indexes{key="protos"} 0
+apisix_etcd_modify_indexes{key="routes"} 222
+apisix_etcd_modify_indexes{key="services"} 0
+apisix_etcd_modify_indexes{key="ssls"} 0
+apisix_etcd_modify_indexes{key="stream_routes"} 0
+apisix_etcd_modify_indexes{key="upstreams"} 0
+apisix_etcd_modify_indexes{key="x_etcd_index"} 223
# HELP apisix_batch_process_entries batch process remaining entries
# TYPE apisix_batch_process_entries gauge
apisix_batch_process_entries{name="http-logger",route_id="9",server_addr="127.0.0.1"} 1
diff --git a/doc/zh-cn/plugins/prometheus.md b/doc/zh-cn/plugins/prometheus.md
index d06db51..24f8408 100644
--- a/doc/zh-cn/plugins/prometheus.md
+++ b/doc/zh-cn/plugins/prometheus.md
@@ -92,8 +92,8 @@ scrape_configs:
我们可以在 `conf/config.yaml` 的 `plugin_attr` 修改默认的uri
-| 名称 | 类型 | 默认值 | 描述 |
-| ------------ | ------ | -------- | -------------------------------------------------------------------- |
+| 名称 | 类型 | 默认值 | 描述 |
+| ---------- | ------ | ---------------------------- | ------------- |
| export_uri | string | "/apisix/prometheus/metrics" | 暴露指标的uri |
配置示例:
@@ -140,6 +140,19 @@ apisix_bandwidth{type="egress",service="foo.com"} 2379
apisix_bandwidth{type="ingress",service="127.0.0.2"} 83
apisix_bandwidth{type="ingress",service="bar.com"} 76
apisix_bandwidth{type="ingress",service="foo.com"} 988
+# HELP apisix_etcd_modify_indexes Etcd modify index for APISIX keys
+# TYPE apisix_etcd_modify_indexes gauge
+apisix_etcd_modify_indexes{key="consumers"} 0
+apisix_etcd_modify_indexes{key="global_rules"} 0
+apisix_etcd_modify_indexes{key="max_modify_index"} 222
+apisix_etcd_modify_indexes{key="prev_index"} 35
+apisix_etcd_modify_indexes{key="protos"} 0
+apisix_etcd_modify_indexes{key="routes"} 222
+apisix_etcd_modify_indexes{key="services"} 0
+apisix_etcd_modify_indexes{key="ssls"} 0
+apisix_etcd_modify_indexes{key="stream_routes"} 0
+apisix_etcd_modify_indexes{key="upstreams"} 0
+apisix_etcd_modify_indexes{key="x_etcd_index"} 223
# HELP apisix_batch_process_entries batch process remaining entries
# TYPE apisix_batch_process_entries gauge
apisix_batch_process_entries{name="http-logger",route_id="9",server_addr="127.0.0.1"} 1