Skip to content
This repository was archived by the owner on Jul 28, 2026. It is now read-only.

Mixin Dashboard Updates #931

Merged
rfratto merged 6 commits into from
Sep 22, 2021
Merged

Mixin Dashboard Updates #931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f1ae145
Show targets by pod
kgeckhart Sep 20, 2021
9fb9965
Switch active series back to appended samples
kgeckhart Sep 20, 2021
3d9241e
Add a new samples rate panel
kgeckhart Sep 20, 2021
8db27ce
1hour time range and 30s refresh for dashboards
kgeckhart Sep 20, 2021
888b24b
Update example dashboards with changes
kgeckhart Sep 20, 2021
42a032a
Add the agent-operational dashboard to the mixin
kgeckhart Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions example/docker-compose/grafana/dashboards/agent-operational.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"graphTooltip": 0,
"hideControls": false,
"links": [ ],
"refresh": "10s",
"refresh": "1m",
"rows": [
{
"collapse": false,
Expand Down Expand Up @@ -117,7 +117,7 @@
"seriesOverrides": [ ],
"spaceLength": 10,
"span": 2,
"stack": "true",
"stack": false,
"steppedLine": false,
"targets": [
{
Expand Down Expand Up @@ -673,7 +673,7 @@
"seriesOverrides": [ ],
"spaceLength": 10,
"span": 2,
"stack": "true",
"stack": false,
"steppedLine": false,
"targets": [
{
Expand Down Expand Up @@ -749,7 +749,7 @@
"seriesOverrides": [ ],
"spaceLength": 10,
"span": 2,
"stack": "true",
"stack": false,
"steppedLine": false,
"targets": [
{
Expand Down Expand Up @@ -825,7 +825,7 @@
"seriesOverrides": [ ],
"spaceLength": 10,
"span": 2,
"stack": "true",
"stack": false,
"steppedLine": false,
"targets": [
{
Expand Down Expand Up @@ -901,7 +901,7 @@
"seriesOverrides": [ ],
"spaceLength": 10,
"span": 2,
"stack": "true",
"stack": false,
"steppedLine": false,
"targets": [
{
Expand Down Expand Up @@ -977,7 +977,7 @@
"seriesOverrides": [ ],
"spaceLength": 10,
"span": 2,
"stack": "true",
"stack": false,
"steppedLine": false,
"targets": [
{
Expand Down
103 changes: 91 additions & 12 deletions example/docker-compose/grafana/dashboards/agent-remote-write.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"hideControls": false,
"id": null,
"links": [ ],
"refresh": "",
"refresh": "1m",
"rows": [
{
"collapse": false,
Expand Down Expand Up @@ -218,6 +218,85 @@
"repeat": null,
"seriesOverrides": [ ],
"spaceLength": 10,
"span": 12,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "rate(agent_wal_samples_appended_total{cluster=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\"}[5m])\n-\n ignoring(remote_name, url) group_right(pod)\n (rate(prometheus_remote_storage_succeeded_samples_total{cluster=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\"}[5m]) or rate(prometheus_remote_storage_samples_total{cluster=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\"}[5m]))\n-\n (rate(prometheus_remote_storage_dropped_samples_total{cluster=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\"}[5m]) or rate(prometheus_remote_storage_samples_dropped_total{cluster=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\"}[5m]))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{pod}}-{{instance_group_name}}-{{url}}",
"refId": "A"
}
],
"thresholds": [ ],
"timeFrom": null,
"timeShift": null,
"title": "Rate, in vs. succeeded or dropped [5m]",
"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
}
]
},
{
"aliasColors": { },
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"gridPos": { },
"id": 5,
"legend": {
"alignAsTable": false,
"avg": false,
"current": 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",
"repeat": null,
"seriesOverrides": [ ],
"spaceLength": 10,
"span": 6,
"stack": false,
"steppedLine": false,
Expand Down Expand Up @@ -274,7 +353,7 @@
"datasource": "$datasource",
"fill": 1,
"gridPos": { },
"id": 5,
"id": 6,
"legend": {
"alignAsTable": false,
"avg": false,
Expand Down Expand Up @@ -353,7 +432,7 @@
"datasource": "$datasource",
"fill": 1,
"gridPos": { },
"id": 6,
"id": 7,
"legend": {
"alignAsTable": false,
"avg": false,
Expand Down Expand Up @@ -432,7 +511,7 @@
"datasource": "$datasource",
"fill": 1,
"gridPos": { },
"id": 7,
"id": 8,
"legend": {
"alignAsTable": false,
"avg": false,
Expand Down Expand Up @@ -524,7 +603,7 @@
"datasource": "$datasource",
"fill": 1,
"gridPos": { },
"id": 8,
"id": 9,
"legend": {
"alignAsTable": false,
"avg": false,
Expand Down Expand Up @@ -604,7 +683,7 @@
"datasource": "$datasource",
"fill": 1,
"gridPos": { },
"id": 9,
"id": 10,
"legend": {
"alignAsTable": false,
"avg": false,
Expand Down Expand Up @@ -683,7 +762,7 @@
"datasource": "$datasource",
"fill": 1,
"gridPos": { },
"id": 10,
"id": 11,
"legend": {
"alignAsTable": false,
"avg": false,
Expand Down Expand Up @@ -762,7 +841,7 @@
"datasource": "$datasource",
"fill": 1,
"gridPos": { },
"id": 11,
"id": 12,
"legend": {
"alignAsTable": false,
"avg": false,
Expand Down Expand Up @@ -854,7 +933,7 @@
"datasource": "$datasource",
"fill": 1,
"gridPos": { },
"id": 12,
"id": 13,
"legend": {
"alignAsTable": false,
"avg": false,
Expand Down Expand Up @@ -946,7 +1025,7 @@
"datasource": "$datasource",
"fill": 1,
"gridPos": { },
"id": 13,
"id": 14,
"legend": {
"alignAsTable": false,
"avg": false,
Expand Down Expand Up @@ -1038,7 +1117,7 @@
"datasource": "$datasource",
"fill": 1,
"gridPos": { },
"id": 14,
"id": 15,
"legend": {
"alignAsTable": false,
"avg": false,
Expand Down Expand Up @@ -1283,7 +1362,7 @@
]
},
"time": {
"from": "now-6h",
"from": "now-1h",
"to": "now"
},
"timepicker": {
Expand Down
10 changes: 5 additions & 5 deletions example/docker-compose/grafana/dashboards/agent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"graphTooltip": 0,
"hideControls": false,
"links": [ ],
"refresh": "10s",
"refresh": "1m",
"rows": [
{
"collapse": false,
Expand Down Expand Up @@ -309,10 +309,10 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(prometheus_sd_discovered_targets{cluster=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\"})",
"expr": "sum by (pod) (prometheus_sd_discovered_targets{cluster=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\"})",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Targets",
"legendFormat": "{{pod}}",
"legendLink": null,
"step": 10
}
Expand Down Expand Up @@ -573,7 +573,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum by (job, instance_group_name) (rate(agent_wal_storage_created_series_total{cluster=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\"}[5m]))",
"expr": "sum by (job, instance_group_name) (rate(agent_wal_samples_appended_total{cluster=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\"}[5m]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{job}} {{instance_group_name}}",
Expand All @@ -584,7 +584,7 @@
"thresholds": [ ],
"timeFrom": null,
"timeShift": null,
"title": "Created Series",
"title": "Appended Samples",
"tooltip": {
"shared": true,
"sort": 0,
Expand Down
27 changes: 23 additions & 4 deletions production/grafana-agent-mixin/dashboards.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ local template = grafana.template;
)
.addPanel(
g.panel('Targets') +
g.queryPanel('sum(prometheus_sd_discovered_targets{cluster=~"$cluster", namespace=~"$namespace", container=~"$container"})', 'Targets') +
g.queryPanel('sum by (pod) (prometheus_sd_discovered_targets{cluster=~"$cluster", namespace=~"$namespace", container=~"$container"})', '{{pod}}') +
g.stack
)
)
Expand Down Expand Up @@ -75,8 +75,8 @@ local template = grafana.template;
g.stack
)
.addPanel(
g.panel('Created Series') +
g.queryPanel('sum by (job, instance_group_name) (rate(agent_wal_storage_created_series_total{cluster=~"$cluster", namespace=~"$namespace", container=~"$container"}[5m]))', '{{job}} {{instance_group_name}}') +
g.panel('Appended Samples') +
g.queryPanel('sum by (job, instance_group_name) (rate(agent_wal_samples_appended_total{cluster=~"$cluster", namespace=~"$namespace", container=~"$container"}[5m]))', '{{job}} {{instance_group_name}}') +
g.stack
)
),
Expand Down Expand Up @@ -119,6 +119,24 @@ local template = grafana.template;
legendFormat='{{cluster}}:{{pod}}-{{instance_group_name}}-{{url}}',
));

local samplesRate =
graphPanel.new(
'Rate, in vs. succeeded or dropped [5m]',
datasource='$datasource',
span=12,
)
.addTarget(prometheus.target(
|||
rate(agent_wal_samples_appended_total{cluster=~"$cluster", namespace=~"$namespace", container=~"$container"}[5m])
-
ignoring(remote_name, url) group_right(pod)
(rate(prometheus_remote_storage_succeeded_samples_total{cluster=~"$cluster", namespace=~"$namespace", container=~"$container"}[5m]) or rate(prometheus_remote_storage_samples_total{cluster=~"$cluster", namespace=~"$namespace", container=~"$container"}[5m]))
-
(rate(prometheus_remote_storage_dropped_samples_total{cluster=~"$cluster", namespace=~"$namespace", container=~"$container"}[5m]) or rate(prometheus_remote_storage_samples_dropped_total{cluster=~"$cluster", namespace=~"$namespace", container=~"$container"}[5m]))
|||,
legendFormat='{{cluster}}:{{pod}}-{{instance_group_name}}-{{url}}',
));

local currentShards =
graphPanel.new(
'Current Shards',
Expand Down Expand Up @@ -242,7 +260,7 @@ local template = grafana.template;
legendFormat='{{cluster}}:{{pod}}-{{instance_group_name}}-{{url}}',
));

dashboard.new('Agent Prometheus Remote Write', tags=['grafana-agent-mixin'], editable=true)
dashboard.new('Agent Prometheus Remote Write', tags=['grafana-agent-mixin'], editable=true, refresh='30s', time_from='now-1h')
.addTemplate(
{
hide: 0,
Expand Down Expand Up @@ -327,6 +345,7 @@ local template = grafana.template;
)
.addRow(
row.new('Samples')
.addPanel(samplesRate)
.addPanel(pendingSamples)
.addPanel(droppedSamples)
.addPanel(failedSamples)
Expand Down
3 changes: 2 additions & 1 deletion production/grafana-agent-mixin/mixin.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
local dashboards = import 'dashboards.libsonnet';
local debugging = import 'debugging.libsonnet';

{
grafanaDashboards+:: std.mapWithKey(function(field, obj) obj {
grafanaDashboardFolder: 'Grafana Agent',
}, dashboards.grafanaDashboards),
}, dashboards.grafanaDashboards + debugging.grafanaDashboards),
}
1 change: 1 addition & 0 deletions production/grafana-agent-mixin/utils.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
injectUtils(dashboard):: dashboard {
tags: ['grafana-agent-mixin'],
refresh: '30s',
addMultiTemplateWithAll(name, metric_name, label_name, all='.*', hide=0):: self {
templating+: {
list+: [{
Expand Down