Skip to content

Commit

Permalink
contrib: Update grafana dashboard to relect new metrics names
Browse files Browse the repository at this point in the history 
Changes to bring a couple of metrics up to date and
to take advantage of the new metric reflecting concurrency
limiting.

Signed-off-by: crozzy <joseph.crosland@gmail.com>
  • Loading branch information
@crozzy
crozzy committed Jan 21, 2022
1 parent 2cc4af7 commit 56c1fe9
Show file tree
Hide file tree
Showing 2 changed files with 184 additions and 24 deletions.
104 changes: 92 additions & 12 deletions contrib/openshift/grafana/dashboards/dashboard-clair.configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,11 @@ data:
]
},
"editable": true,
"fiscalYearStartMonth": 0,
"gnetId": null,
"graphTooltip": 1,
"id": 162,
"iteration": 1637602132532,
"id": 1,
"iteration": 1642631554696,
"links": [],
"liveNow": false,
"panels": [
{
"datasource": "$datasource",
Expand Down Expand Up @@ -276,6 +274,88 @@ data:
"title": "Authentication",
"type": "timeseries"
},
{
"datasource": "$datasource",
"description": "",
"fieldConfig": {
"defaults": {
"color": {
"mode": "palette-classic"
},
"custom": {
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
"showPoints": "auto",
"spanNulls": false,
"stacking": {
"group": "A",
"mode": "none"
},
"thresholdsStyle": {
"mode": "off"
}
},
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 8,
"w": 12,
"x": 12,
"y": 9
},
"id": 45,
"options": {
"legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom"
},
"tooltip": {
"mode": "single"
}
},
"targets": [
{
"exemplar": true,
"expr": "rate(clair_http_concurrencylimited_total[$rate])",
"interval": "",
"legendFormat": "Endpoint: {{ endpoint }} Method: {{ method }}",
"refId": "A"
}
],
"title": "Ratelimiting",
"type": "timeseries"
},
{
"collapsed": false,
"datasource": "$datasource",
Expand Down Expand Up @@ -1392,7 +1472,7 @@ data:
"targets": [
{
"exemplar": true,
"expr": "sum by (code) (rate(clair_http_indexer_api_v1_index_report_request_total[$rate]))",
"expr": "sum by (code) (rate(clair_http_indexerv1_request_total{handler=\"/indexer/api/v1/index_report\", method=\"post\"}[$rate]))",
"instant": false,
"interval": "1",
"legendFormat": "Status {{ code }} ",
Expand Down Expand Up @@ -1475,7 +1555,7 @@ data:
"targets": [
{
"exemplar": true,
"expr": "histogram_quantile($apiquantile, rate(clair_http_indexer_api_v1_index_report_request_duration_seconds_bucket[$rate]))",
"expr": "histogram_quantile($apiquantile, rate(clair_http_indexerv1_request_duration_seconds_bucket{method=\"post\", handler=\"/indexer/api/v1/index_report\"}[$rate]))",
"instant": false,
"interval": "1",
"legendFormat": "",
Expand Down Expand Up @@ -1557,7 +1637,7 @@ data:
"targets": [
{
"exemplar": true,
"expr": "sum by (code) (rate(clair_http_indexer_api_v1_index_state_request_total[$rate]))",
"expr": "sum by (code) (rate(clair_http_indexerv1_request_total{handler=\"/indexer/api/v1/index_state\", method=\"get\"}[$rate]))",
"instant": false,
"interval": "",
"legendFormat": "Status {{code}}",
Expand Down Expand Up @@ -1640,7 +1720,7 @@ data:
"targets": [
{
"exemplar": true,
"expr": "histogram_quantile($apiquantile, rate(clair_http_indexer_api_v1_index_state_request_duration_seconds_bucket[$rate]))",
"expr": "histogram_quantile($apiquantile, rate(clair_http_indexerv1_request_duration_seconds_bucket{method=\"get\", handler=\"/indexer/api/v1/index_state\"}[$rate]))",
"instant": false,
"interval": "",
"legendFormat": "",
Expand Down Expand Up @@ -1722,7 +1802,7 @@ data:
"targets": [
{
"exemplar": true,
"expr": "sum by (code) (rate(clair_http_indexer_api_v1_index_report_get_request_total[$rate]))",
"expr": "sum by (code) (rate(clair_http_indexerv1_request_total{method=\"get\", handler=\"/indexer/api/v1/index_report/:digest\"}[$rate]))",
"instant": false,
"interval": "1",
"legendFormat": "Status {{ code }} ",
Expand Down Expand Up @@ -1804,7 +1884,7 @@ data:
"targets": [
{
"exemplar": true,
"expr": "histogram_quantile($apiquantile, rate(clair_http_indexer_api_v1_index_report_get_request_duration_seconds_bucket[$rate]))",
"expr": "histogram_quantile($apiquantile, rate(clair_http_indexerv1_request_duration_seconds_bucket{method=\"get\", handler=\"/indexer/api/v1/index_report/:digest\"}[$rate]))",
"instant": false,
"interval": "1",
"legendFormat": "",
Expand Down Expand Up @@ -2320,8 +2400,8 @@ data:
"type": "timeseries"
}
],
"refresh": false,
"schemaVersion": 31,
"refresh": "",
"schemaVersion": 30,
"style": "dark",
"tags": [],
"templating": {
Expand Down
104 changes: 92 additions & 12 deletions local-dev/grafana/provisioning/dashboards/dashboard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@
]
},
"editable": true,
"fiscalYearStartMonth": 0,
"gnetId": null,
"graphTooltip": 1,
"id": 162,
"iteration": 1637602132532,
"id": 1,
"iteration": 1642631554696,
"links": [],
"liveNow": false,
"panels": [
{
"datasource": "$datasource",
Expand Down Expand Up @@ -263,6 +261,88 @@
"title": "Authentication",
"type": "timeseries"
},
{
"datasource": "$datasource",
"description": "",
"fieldConfig": {
"defaults": {
"color": {
"mode": "palette-classic"
},
"custom": {
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
"showPoints": "auto",
"spanNulls": false,
"stacking": {
"group": "A",
"mode": "none"
},
"thresholdsStyle": {
"mode": "off"
}
},
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 8,
"w": 12,
"x": 12,
"y": 9
},
"id": 45,
"options": {
"legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom"
},
"tooltip": {
"mode": "single"
}
},
"targets": [
{
"exemplar": true,
"expr": "rate(clair_http_concurrencylimited_total[$rate])",
"interval": "",
"legendFormat": "Endpoint: {{ endpoint }} Method: {{ method }}",
"refId": "A"
}
],
"title": "Ratelimiting",
"type": "timeseries"
},
{
"collapsed": false,
"datasource": "$datasource",
Expand Down Expand Up @@ -1379,7 +1459,7 @@
"targets": [
{
"exemplar": true,
"expr": "sum by (code) (rate(clair_http_indexer_api_v1_index_report_request_total[$rate]))",
"expr": "sum by (code) (rate(clair_http_indexerv1_request_total{handler=\"/indexer/api/v1/index_report\", method=\"post\"}[$rate]))",
"instant": false,
"interval": "1",
"legendFormat": "Status {{ code }} ",
Expand Down Expand Up @@ -1462,7 +1542,7 @@
"targets": [
{
"exemplar": true,
"expr": "histogram_quantile($apiquantile, rate(clair_http_indexer_api_v1_index_report_request_duration_seconds_bucket[$rate]))",
"expr": "histogram_quantile($apiquantile, rate(clair_http_indexerv1_request_duration_seconds_bucket{method=\"post\", handler=\"/indexer/api/v1/index_report\"}[$rate]))",
"instant": false,
"interval": "1",
"legendFormat": "",
Expand Down Expand Up @@ -1544,7 +1624,7 @@
"targets": [
{
"exemplar": true,
"expr": "sum by (code) (rate(clair_http_indexer_api_v1_index_state_request_total[$rate]))",
"expr": "sum by (code) (rate(clair_http_indexerv1_request_total{handler=\"/indexer/api/v1/index_state\", method=\"get\"}[$rate]))",
"instant": false,
"interval": "",
"legendFormat": "Status {{code}}",
Expand Down Expand Up @@ -1627,7 +1707,7 @@
"targets": [
{
"exemplar": true,
"expr": "histogram_quantile($apiquantile, rate(clair_http_indexer_api_v1_index_state_request_duration_seconds_bucket[$rate]))",
"expr": "histogram_quantile($apiquantile, rate(clair_http_indexerv1_request_duration_seconds_bucket{method=\"get\", handler=\"/indexer/api/v1/index_state\"}[$rate]))",
"instant": false,
"interval": "",
"legendFormat": "",
Expand Down Expand Up @@ -1709,7 +1789,7 @@
"targets": [
{
"exemplar": true,
"expr": "sum by (code) (rate(clair_http_indexer_api_v1_index_report_get_request_total[$rate]))",
"expr": "sum by (code) (rate(clair_http_indexerv1_request_total{method=\"get\", handler=\"/indexer/api/v1/index_report/:digest\"}[$rate]))",
"instant": false,
"interval": "1",
"legendFormat": "Status {{ code }} ",
Expand Down Expand Up @@ -1791,7 +1871,7 @@
"targets": [
{
"exemplar": true,
"expr": "histogram_quantile($apiquantile, rate(clair_http_indexer_api_v1_index_report_get_request_duration_seconds_bucket[$rate]))",
"expr": "histogram_quantile($apiquantile, rate(clair_http_indexerv1_request_duration_seconds_bucket{method=\"get\", handler=\"/indexer/api/v1/index_report/:digest\"}[$rate]))",
"instant": false,
"interval": "1",
"legendFormat": "",
Expand Down Expand Up @@ -2307,8 +2387,8 @@
"type": "timeseries"
}
],
"refresh": false,
"schemaVersion": 31,
"refresh": "",
"schemaVersion": 30,
"style": "dark",
"tags": [],
"templating": {
Expand Down

0 comments on commit 56c1fe9

Please sign in to comment.