Merge "Dashboard rationalization"

This commit is contained in:
Richard Felkl 2018-06-26 12:46:48 +00:00 committed by Gerrit Code Review
commit a335a1678d
7 changed files with 11081 additions and 4718 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -1,18 +1,40 @@
{% raw %}
{%- raw %}
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "prometheus",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"description": "Monitors Remote Storage Adapter using Prometheus.",
"editable": true,
"gnetId": 315,
"gnetId": null,
"graphTooltip": 1,
"hideControls": false,
"id": null,
"iteration": 1529933870105,
"links": [],
"refresh": "1m",
"rows": [
{
"collapse": false,
"height": 250,
"panels": [
{
"collapsed": false,
"gridPos": {
"h": 1,
"w": 24,
"x": 0,
"y": 0
},
"id": 10,
"panels": [],
"repeat": null,
"title": "Status",
"type": "row"
},
{
"cacheTimeout": null,
"colorBackground": false,
@ -20,9 +42,9 @@
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
"#299c46"
],
"datasource": "prometheus",
"datasource": null,
"format": "none",
"gauge": {
"maxValue": 1,
@ -31,6 +53,12 @@
"thresholdLabels": false,
"thresholdMarkers": true
},
"gridPos": {
"h": 3,
"w": 24,
"x": 0,
"y": 1
},
"id": 1,
"interval": null,
"links": [],
@ -46,6 +74,7 @@
}
],
"maxDataPoints": 100,
"minSpan": 3,
"nullPointMode": "connected",
"nullText": null,
"postfix": "",
@ -59,17 +88,18 @@
"to": "null"
}
],
"span": 2,
"repeat": null,
"repeatDirection": "h",
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
"lineColor": "rgb(31, 120, 193)",
"show": true
"show": false
},
"tableColumn": "",
"targets": [
{
"expr": "max(up{job=\"remote_storage_adapter\"})",
"expr": "up{job=\"remote_storage_adapter\",instance=~\"$instance:[1-9][0-9]*\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "",
@ -77,8 +107,8 @@
"step": 20
}
],
"thresholds": "0.5,0.5",
"title": "Status",
"thresholds": "1,1",
"title": "Health",
"type": "singlestat",
"valueFontSize": "80%",
"valueMaps": [
@ -89,31 +119,52 @@
},
{
"op": "=",
"text": "OK",
"value": "1"
"text": "FAIL",
"value": "0"
},
{
"op": "=",
"text": "DOWN",
"value": "0"
"text": "OK",
"value": "1"
}
],
"valueName": "current"
},
{
"collapsed": false,
"gridPos": {
"h": 1,
"w": 24,
"x": 0,
"y": 4
},
"id": 13,
"panels": [],
"title": "Samples",
"type": "row"
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "prometheus",
"datasource": null,
"decimals": 0,
"fill": 1,
"gridPos": {
"h": 7,
"w": 12,
"x": 0,
"y": 5
},
"id": 2,
"legend": {
"alignAsTable": true,
"avg": false,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": false
@ -121,19 +172,21 @@
"lines": true,
"linewidth": 1,
"links": [],
"minSpan": 3,
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"repeat": null,
"repeatDirection": "h",
"seriesOverrides": [],
"spaceLength": 10,
"span": 5,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "irate(sent_samples_total{job=\"remote_storage_adapter\",instance=~\"$RemoteStorageAdapter:[1-9][0-9]*\"}[1m])",
"expr": "rate(sent_samples_total{job=\"remote_storage_adapter\",instance=~\"$instance:[1-9][0-9]*\"}[$rate_interval])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "sent",
@ -141,95 +194,25 @@
"step": 2
},
{
"expr": "irate(received_samples_total{job=\"remote_storage_adapter\",instance=~\"$RemoteStorageAdapter:[1-9][0-9]*\"}[1m])",
"expr": "rate(received_samples_total{job=\"remote_storage_adapter\",instance=~\"$instance:[1-9][0-9]*\"}[$rate_interval])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "received",
"refId": "B",
"step": 2
}
],
"thresholds": [],
"timeFrom": null,
"timeShift": null,
"title": "Sent/Received samples",
"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": "0",
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
]
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "prometheus",
"decimals": 0,
"fill": 1,
"id": 3,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"span": 5,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "irate(prometheus_influxdb_ignored_samples_total{job=\"remote_storage_adapter\",instance=~\"$RemoteStorageAdapter:[1-9][0-9]*\"}[1m])",
"expr": "rate(prometheus_influxdb_ignored_samples_total{job=\"remote_storage_adapter\",instance=~\"$instance:[1-9][0-9]*\"}[$rate_interval])",
"format": "time_series",
"intervalFactor": 2,
"intervalFactor": 1,
"legendFormat": "ignored",
"refId": "C",
"step": 2
"refId": "C"
}
],
"thresholds": [],
"timeFrom": null,
"timeShift": null,
"title": "Ignored samples",
"title": "Samples rate",
"tooltip": {
"shared": true,
"sort": 0,
@ -246,7 +229,7 @@
"yaxes": [
{
"format": "short",
"label": null,
"label": "Samples / Second",
"logBase": 1,
"max": null,
"min": "0",
@ -260,25 +243,37 @@
"min": null,
"show": true
}
]
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "prometheus",
"datasource": null,
"decimals": 2,
"fill": 1,
"gridPos": {
"h": 7,
"w": 12,
"x": 12,
"y": 5
},
"id": 4,
"legend": {
"avg": false,
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"show": true,
"rightSide": true,
"show": false,
"total": false,
"values": false
"values": true
},
"lines": true,
"linewidth": 1,
@ -288,17 +283,17 @@
"pointradius": 5,
"points": false,
"renderer": "flot",
"repeat": null,
"seriesOverrides": [],
"spaceLength": 10,
"span": 12,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "irate(sent_batch_duration_seconds_sum{job=\"remote_storage_adapter\",instance=~\"$RemoteStorageAdapter:[1-9][0-9]*\"}[1m])",
"expr": "rate(sent_batch_duration_seconds_sum{job=\"remote_storage_adapter\"}[$rate_interval])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "duration",
"legendFormat": "{{ instance }}",
"refId": "C",
"step": 2
}
@ -306,7 +301,7 @@
"thresholds": [],
"timeFrom": null,
"timeShift": null,
"title": "Batch duration",
"title": "Batch Duration",
"tooltip": {
"shared": true,
"sort": 0,
@ -323,7 +318,7 @@
"yaxes": [
{
"format": "short",
"label": null,
"label": "Batch / Second",
"logBase": 1,
"max": null,
"min": "0",
@ -337,33 +332,238 @@
"min": null,
"show": true
}
]
}
],
"repeat": null,
"repeatIteration": null,
"repeatRowId": null,
"showTitle": true,
"title": "Service Status",
"titleSize": "h6"
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"collapse": false,
"height": 250,
"panels": [
"collapsed": false,
"gridPos": {
"h": 1,
"w": 24,
"x": 0,
"y": 12
},
"id": 11,
"panels": [],
"repeat": null,
"title": "Resources",
"type": "row"
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": null,
"decimals": 2,
"editable": true,
"error": false,
"fill": 1,
"gridPos": {
"h": 7,
"w": 12,
"x": 0,
"y": 13
},
"id": 9,
"legend": {
"alignAsTable": true,
"avg": false,
"current": false,
"hideEmpty": false,
"max": false,
"min": false,
"rightSide": true,
"show": false,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"repeat": null,
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "rate(process_cpu_seconds_total{job=\"remote_storage_adapter\"}[$rate_interval])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{ instance }}",
"metric": "prometheus_local_storage_ingested_samples_total",
"refId": "B",
"step": 10
}
],
"thresholds": [],
"timeFrom": null,
"timeShift": null,
"title": "CPU Usage Rate",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": [
"avg"
]
},
"yaxes": [
{
"format": "none",
"label": "CPU seconds / Second",
"logBase": 1,
"max": null,
"min": "0",
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": null,
"editable": true,
"error": false,
"fill": 1,
"gridPos": {
"h": 7,
"w": 12,
"x": 12,
"y": 13
},
"id": 7,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": false,
"total": false,
"values": true
},
"lines": true,
"linewidth": 1,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"repeat": null,
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "rate(go_memstats_alloc_bytes_total{job=\"remote_storage_adapter\"}[$rate_interval])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{ instance }}",
"metric": "go_memstats_alloc_bytes",
"refId": "A",
"step": 10
}
],
"thresholds": [],
"timeFrom": null,
"timeShift": null,
"title": "Allocation Rate",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "Bps",
"label": "",
"logBase": 1,
"max": null,
"min": "0",
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": null,
"decimals": null,
"editable": true,
"error": false,
"fill": 1,
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 20
},
"id": 6,
"legend": {
"alignAsTable": true,
"avg": false,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": false
@ -371,23 +571,27 @@
"lines": true,
"linewidth": 1,
"links": [],
"minSpan": 3,
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"repeat": null,
"repeatDirection": "v",
"seriesOverrides": [
{
"alias": "/-/",
"fill": 0
}
],
"span": 4,
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "process_resident_memory_bytes{job=\"remote_storage_adapter\",instance=~\"$RemoteStorageAdapter:[1-9][0-9]*\"}",
"expr": "process_resident_memory_bytes{job=\"remote_storage_adapter\",instance=~\"$instance:[1-9][0-9]*\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "RSS",
"metric": "process_resident_memory_bytes",
@ -395,25 +599,28 @@
"step": 10
},
{
"expr": "max_over_time(go_memstats_alloc_bytes{job=\"remote_storage_adapter\",instance=~\"$RemoteStorageAdapter:[1-9][0-9]*\"}[5m])",
"expr": "max_over_time(go_memstats_alloc_bytes{job=\"remote_storage_adapter\",instance=~\"$instance:[1-9][0-9]*\"}[$rate_interval])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Allocated bytes - 5m max",
"legendFormat": "allocated max in {{ $rate_interval }}",
"metric": "go_memstats_alloc_bytes",
"refId": "D",
"step": 10
},
{
"expr": "go_memstats_alloc_bytes{job=\"remote_storage_adapter\",instance=~\"$RemoteStorageAdapter:[1-9][0-9]*\"}",
"expr": "go_memstats_alloc_bytes{job=\"remote_storage_adapter\",instance=~\"$instance:[1-9][0-9]*\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Allocated bytes",
"legendFormat": "allocated current",
"metric": "go_memstats_alloc_bytes",
"refId": "A",
"step": 10
},
{
"expr": "min_over_time(go_memstats_alloc_bytes{job=\"remote_storage_adapter\",instance=~\"$RemoteStorageAdapter:[1-9][0-9]*\"}[5m])",
"expr": "min_over_time(go_memstats_alloc_bytes{job=\"remote_storage_adapter\",instance=~\"$instance:[1-9][0-9]*\"}[$rate_interval])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Allocated bytes - 5m min",
"legendFormat": "allocated min in {{ $rate_interval }}",
"metric": "go_memstats_alloc_bytes",
"refId": "C",
"step": 10
@ -431,6 +638,7 @@
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
@ -439,7 +647,7 @@
"yaxes": [
{
"format": "bytes",
"label": null,
"label": "",
"logBase": 1,
"max": null,
"min": "0",
@ -453,181 +661,15 @@
"min": null,
"show": true
}
]
},
{
"aliasColors": {},
"bars": false,
"editable": true,
"error": false,
"fill": 1,
"id": 7,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"span": 4,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "rate(go_memstats_alloc_bytes_total{job=\"remote_storage_adapter\",instance=~\"$RemoteStorageAdapter:[1-9][0-9]*\"}[1m])",
"intervalFactor": 2,
"legendFormat": "Allocated Bytes/s",
"metric": "go_memstats_alloc_bytes",
"refId": "A",
"step": 10
],
"yaxis": {
"align": false,
"alignLevel": null
}
}
],
"thresholds": [],
"timeFrom": null,
"timeShift": null,
"title": "Allocations",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "bytes",
"label": null,
"logBase": 1,
"max": null,
"min": "0",
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
]
},
{
"aliasColors": {},
"bars": false,
"decimals": 2,
"editable": true,
"error": false,
"fill": 1,
"id": 9,
"legend": {
"alignAsTable": false,
"avg": false,
"current": false,
"hideEmpty": false,
"max": false,
"min": false,
"rightSide": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"span": 4,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "irate(process_cpu_seconds_total{job=\"remote_storage_adapter\",instance=~\"$RemoteStorageAdapter:[1-9][0-9]*\"}[1m])",
"intervalFactor": 2,
"legendFormat": "Irate",
"metric": "prometheus_local_storage_ingested_samples_total",
"refId": "A",
"step": 10
},
{
"expr": "rate(process_cpu_seconds_total{job=\"remote_storage_adapter\",instance=~\"$RemoteStorageAdapter:[1-9][0-9]*\"}[5m])",
"intervalFactor": 2,
"legendFormat": "5m rate",
"metric": "prometheus_local_storage_ingested_samples_total",
"refId": "B",
"step": 10
}
],
"thresholds": [],
"timeFrom": null,
"timeShift": null,
"title": "CPU",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"mode": "time",
"name": null,
"show": true,
"values": [
"avg"
]
},
"yaxes": [
{
"format": "none",
"label": null,
"logBase": 1,
"max": null,
"min": "0",
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
]
}
],
"repeat": null,
"repeatIteration": null,
"repeatRowId": null,
"showTitle": true,
"title": "Memory & CPU",
"titleSize": "h6"
}
],
"schemaVersion": 14,
"sharedCrosshair": true,
"refresh": "1m",
"schemaVersion": 16,
"style": "dark",
"tags": [
"prometheus"
@ -636,16 +678,19 @@
"list": [
{
"allValue": null,
"current": {},
"current": {
"text": "10.0.0.14",
"value": "10.0.0.14"
},
"datasource": null,
"hide": 0,
"includeAll": false,
"label": "Remote Storage Adapter host",
"label": "instance",
"multi": false,
"name": "RemoteStorageAdapter",
"name": "instance",
"options": [],
"query": "query_result(up{job=\"remote_storage_adapter\"} == 1)",
"refresh": 1,
"refresh_on_load": true,
"regex": ".*instance=\"([^:]+):[1-9][0-9]*\".*",
"sort": 1,
"tagValuesQuery": null,
@ -653,6 +698,53 @@
"tagsQuery": null,
"type": "query",
"useTags": false
},
{
"allValue": null,
"current": {
"tags": [],
"text": "3m",
"value": "3m"
},
"hide": 0,
"includeAll": false,
"label": "rate_interval",
"multi": false,
"name": "rate_interval",
"options": [
{
"selected": false,
"text": "1m",
"value": "1m"
},
{
"selected": false,
"text": "2m",
"value": "2m"
},
{
"selected": true,
"text": "3m",
"value": "3m"
},
{
"selected": false,
"text": "5m",
"value": "5m"
},
{
"selected": false,
"text": "10m",
"value": "10m"
},
{
"selected": false,
"text": "15m",
"value": "15m"
}
],
"query": "1m,2m,3m,5m,10m,15m",
"type": "custom"
}
]
},
@ -687,6 +779,7 @@
},
"timezone": "browser",
"title": "Remote Storage Adapter",
"version": 1
"uid": null,
"version": 2
}
{% endraw %}
{%- endraw %}

View file

@ -1,4 +1,4 @@
{% from "prometheus/map.jinja" import server with context %}
{% from "prometheus/map.jinja" import server, relay with context %}
dashboard:
prometheus-performances_prometheus:
datasource: prometheus
@ -20,3 +20,9 @@ dashboard:
datasource: prometheus
format: json
template: prometheus/files/grafana_dashboards/pushgateway_prometheus.json
{%- if relay.get('enabled', False) %}
relay_prometheus:
datasource: prometheus
format: json
template: prometheus/files/grafana_dashboards/relay_prometheus.json
{%- endif %}