diff --git a/examples/kustomize.jsonnet b/examples/kustomize.jsonnet
index 2bd3c532c159ecd29c638c915e738eb8b4d543e2..8ee6f8abd27eb7e87ad5536ddd17ef1f98f41e7d 100644
--- a/examples/kustomize.jsonnet
+++ b/examples/kustomize.jsonnet
@@ -1,6 +1,6 @@
local kp =
- (import 'kube-prometheus/kube-prometheus.libsonnet') +
- (import 'kube-prometheus/kube-prometheus-aws-eks-cni.libsonnet') + {
+ (import 'kube-prometheus/kube-prometheus.libsonnet') + {
+
_config+:: {
namespace: 'monitoring',
},
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index d286c7753d34ba26aa38546559fe737f9f0b0098..7e4bf0479382be7ec03f2dcf5f2a712cc6aadede 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -7,7 +7,7 @@
"directory": "jsonnet/kube-prometheus"
}
},
- "version": ""
+ "version": "aws_eks_cni"
},
{
"name": "ksonnet",
@@ -77,7 +77,7 @@
"subdir": "Documentation/etcd-mixin"
}
},
- "version": "5dc12f27251ad6f5f0744ad33ea7d731480f4b87"
+ "version": "92f313811e7a9e0dbe73f288d27408817cb7865d"
},
{
"name": "prometheus",
@@ -87,7 +87,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "b5a16a8f861c29799f9a903f1e0859f513e862ed"
+ "version": "5f1be2cf455409d3577ac9ddb43144ec2d39c90b"
},
{
"name": "node-mixin",
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 9ab00dadb17adbcd34d7e5e788d8a1ecd7986d3e..75a8b63b1b4248f6415c8478b1b411791bd8cf90 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -15227,6 +15227,12 @@ items:
data:
prometheus-remote-write.json: |-
{
+ "__inputs": [
+
+ ],
+ "__requires": [
+
+ ],
"annotations": {
"list": [
@@ -15236,14 +15242,15 @@ items:
"gnetId": null,
"graphTooltip": 0,
"hideControls": false,
+ "id": null,
"links": [
],
- "refresh": "10s",
+ "refresh": "",
"rows": [
{
"collapse": false,
- "height": "250px",
+ "collapsed": false,
"panels": [
{
"aliasColors": {
@@ -15254,12 +15261,17 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 1,
- "id": 1,
+ "gridPos": {
+
+ },
+ "id": 2,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": true,
"total": false,
"values": false
@@ -15269,11 +15281,103 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "repeat": null,
+ "seriesOverrides": [
+
+ ],
+ "spaceLength": 10,
+ "span": 6,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "expr": "(\n prometheus_remote_storage_highest_timestamp_in_seconds{cluster=~\"$cluster\", instance=~\"$instance\"} \n- \n ignoring(queue) group_right(instance) prometheus_remote_storage_queue_highest_sent_timestamp_seconds{cluster=~\"$cluster\", instance=~\"$instance\"}\n)\n",
+ "format": "time_series",
+ "intervalFactor": 2,
+ "legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
+ "refId": "A"
+ }
+ ],
+ "thresholds": [
+
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Highest Timestamp In vs. Highest Timestamp Sent",
+ "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": 3,
+ "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": [
],
@@ -15283,12 +15387,244 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "prometheus_remote_storage_highest_timestamp_in_seconds{cluster=~\"$cluster\", instance=~\"$instance\"} - ignoring(queue) group_right(instance) prometheus_remote_storage_queue_highest_sent_timestamp_seconds{cluster=~\"$cluster\", instance=~\"$instance\"}",
+ "expr": "(\n rate(prometheus_remote_storage_highest_timestamp_in_seconds{cluster=~\"$cluster\", instance=~\"$instance\"}[5m]) \n- \n ignoring (queue) group_right(instance) rate(prometheus_remote_storage_queue_highest_sent_timestamp_seconds{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])\n)\n",
+ "format": "time_series",
+ "intervalFactor": 2,
+ "legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
+ "refId": "A"
+ }
+ ],
+ "thresholds": [
+
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Rate[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
+ }
+ ]
+ }
+ ],
+ "repeat": null,
+ "repeatIteration": null,
+ "repeatRowId": null,
+ "showTitle": true,
+ "title": "Timestamps",
+ "titleSize": "h6",
+ "type": "row"
+ },
+ {
+ "collapse": false,
+ "collapsed": false,
+ "panels": [
+ {
+ "aliasColors": {
+
+ },
+ "bars": false,
+ "dashLength": 10,
+ "dashes": false,
+ "datasource": "$datasource",
+ "fill": 1,
+ "gridPos": {
+
+ },
+ "id": 4,
+ "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": 12,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "expr": "rate(\n prometheus_remote_storage_samples_in_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])\n- \n ignoring(queue) group_right(instance) rate(prometheus_remote_storage_succeeded_samples_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m]) \n- \n rate(prometheus_remote_storage_dropped_samples_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])\n",
+ "format": "time_series",
+ "intervalFactor": 2,
+ "legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
+ "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
+ }
+ ]
+ }
+ ],
+ "repeat": null,
+ "repeatIteration": null,
+ "repeatRowId": null,
+ "showTitle": true,
+ "title": "Samples",
+ "titleSize": "h6",
+ "type": "row"
+ },
+ {
+ "collapse": false,
+ "collapsed": false,
+ "panels": [
+ {
+ "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": [
+
+ ],
+ "minSpan": 6,
+ "nullPointMode": "null",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "repeat": "queue",
+ "seriesOverrides": [
+ {
+ "alias": "/max_shards/",
+ "yaxis": 2
+ }
+ ],
+ "spaceLength": 10,
+ "span": 12,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "expr": "prometheus_remote_storage_shards_max{cluster=~\"$cluster\", instance=~\"$instance\"}",
+ "format": "time_series",
+ "intervalFactor": 2,
+ "legendFormat": "max_shards:{{queue}}",
+ "refId": "A"
+ },
+ {
+ "expr": "prometheus_remote_storage_shards_min{cluster=~\"$cluster\", instance=~\"$instance\"}",
+ "format": "time_series",
+ "intervalFactor": 2,
+ "legendFormat": "min_shards:{{queue}}",
+ "refId": "B"
+ },
+ {
+ "expr": "prometheus_remote_storage_shards_desired{cluster=~\"$cluster\", instance=~\"$instance\"}",
+ "format": "time_series",
+ "intervalFactor": 2,
+ "legendFormat": "desired_shards:{{queue}}",
+ "refId": "C"
+ },
+ {
+ "expr": "prometheus_remote_storage_shards{cluster=~\"$cluster\", instance=~\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
- "legendLink": null,
- "step": 10
+ "legendFormat": "current_shards:{{queue}}",
+ "refId": "D"
}
],
"thresholds": [
@@ -15296,7 +15632,7 @@ items:
],
"timeFrom": null,
"timeShift": null,
- "title": "Highest Timestamp In vs. Highest Timestamp Sent",
+ "title": "Shards: $queue",
"tooltip": {
"shared": true,
"sort": 0,
@@ -15314,11 +15650,11 @@ items:
},
"yaxes": [
{
- "format": "s",
+ "format": "short",
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
@@ -15327,10 +15663,23 @@ items:
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
- },
+ }
+ ],
+ "repeat": null,
+ "repeatIteration": null,
+ "repeatRowId": null,
+ "showTitle": true,
+ "title": "Shards",
+ "titleSize": "h6",
+ "type": "row"
+ },
+ {
+ "collapse": false,
+ "collapsed": false,
+ "panels": [
{
"aliasColors": {
@@ -15340,12 +15689,17 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 1,
- "id": 2,
+ "gridPos": {
+
+ },
+ "id": 6,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": true,
"total": false,
"values": false
@@ -15355,11 +15709,12 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": "queue",
"seriesOverrides": [
],
@@ -15369,12 +15724,11 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "rate(prometheus_remote_storage_highest_timestamp_in_seconds{cluster=~\"$cluster\", instance=~\"$instance\"}[5m]) - ignoring (queue) group_right(instance) rate(prometheus_remote_storage_queue_highest_sent_timestamp_seconds{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])",
+ "expr": "prometheus_remote_storage_shard_capacity{cluster=~\"$cluster\", instance=~\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
- "legendLink": null,
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -15382,7 +15736,7 @@ items:
],
"timeFrom": null,
"timeShift": null,
- "title": "Rate[5m]",
+ "title": "Shard Capacity: $queue",
"tooltip": {
"shared": true,
"sort": 0,
@@ -15404,7 +15758,7 @@ items:
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
@@ -15413,22 +15767,10 @@ items:
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
- }
- ],
- "repeat": null,
- "repeatIteration": null,
- "repeatRowId": null,
- "showTitle": true,
- "title": "Timestamps",
- "titleSize": "h6"
- },
- {
- "collapse": false,
- "height": "250px",
- "panels": [
+ },
{
"aliasColors": {
@@ -15438,12 +15780,17 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 1,
- "id": 3,
+ "gridPos": {
+
+ },
+ "id": 7,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": true,
"total": false,
"values": false
@@ -15453,26 +15800,26 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": "queue",
"seriesOverrides": [
],
"spaceLength": 10,
- "span": 12,
+ "span": 6,
"stack": false,
"steppedLine": false,
"targets": [
{
- "expr": "rate(prometheus_remote_storage_samples_in_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])- ignoring(queue) group_right(instance) rate(prometheus_remote_storage_succeeded_samples_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m]) - rate(prometheus_remote_storage_dropped_samples_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])",
+ "expr": "prometheus_remote_storage_pending_samples{cluster=~\"$cluster\", instance=~\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
- "legendLink": null,
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -15480,7 +15827,7 @@ items:
],
"timeFrom": null,
"timeShift": null,
- "title": "Rate, in vs. succeeded or dropped [5m]",
+ "title": "Pending Samples: $queue",
"tooltip": {
"shared": true,
"sort": 0,
@@ -15502,7 +15849,7 @@ items:
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
@@ -15511,7 +15858,7 @@ items:
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
}
@@ -15520,12 +15867,13 @@ items:
"repeatIteration": null,
"repeatRowId": null,
"showTitle": true,
- "title": "Samples",
- "titleSize": "h6"
+ "title": "Shard Details",
+ "titleSize": "h6",
+ "type": "row"
},
{
"collapse": false,
- "height": "250px",
+ "collapsed": false,
"panels": [
{
"aliasColors": {
@@ -15536,12 +15884,17 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 1,
- "id": 4,
+ "gridPos": {
+
+ },
+ "id": 8,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": true,
"total": false,
"values": false
@@ -15551,11 +15904,12 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
@@ -15565,12 +15919,11 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "prometheus_remote_storage_shards{cluster=~\"$cluster\", instance=~\"$instance\"}",
+ "expr": "prometheus_tsdb_wal_segment_current{cluster=~\"$cluster\", instance=~\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
- "legendLink": null,
- "step": 10
+ "legendFormat": "{{cluster}}:{{instance}}",
+ "refId": "A"
}
],
"thresholds": [
@@ -15578,7 +15931,7 @@ items:
],
"timeFrom": null,
"timeShift": null,
- "title": "Num. Shards",
+ "title": "TSDB Current Segment",
"tooltip": {
"shared": true,
"sort": 0,
@@ -15596,11 +15949,11 @@ items:
},
"yaxes": [
{
- "format": "short",
+ "format": "none",
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
@@ -15609,7 +15962,7 @@ items:
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
},
@@ -15622,12 +15975,17 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 1,
- "id": 5,
+ "gridPos": {
+
+ },
+ "id": 9,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": true,
"total": false,
"values": false
@@ -15637,11 +15995,12 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
@@ -15651,12 +16010,11 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "prometheus_remote_storage_shard_capacity{cluster=~\"$cluster\", instance=~\"$instance\"}",
+ "expr": "prometheus_wal_watcher_current_segment{cluster=~\"$cluster\", instance=~\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
- "legendLink": null,
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -15664,7 +16022,7 @@ items:
],
"timeFrom": null,
"timeShift": null,
- "title": "Capacity",
+ "title": "Remote Write Current Segment",
"tooltip": {
"shared": true,
"sort": 0,
@@ -15682,11 +16040,11 @@ items:
},
"yaxes": [
{
- "format": "short",
+ "format": "none",
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
@@ -15695,7 +16053,7 @@ items:
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
}
@@ -15704,12 +16062,13 @@ items:
"repeatIteration": null,
"repeatRowId": null,
"showTitle": true,
- "title": "Shards",
- "titleSize": "h6"
+ "title": "Segments",
+ "titleSize": "h6",
+ "type": "row"
},
{
"collapse": false,
- "height": "250px",
+ "collapsed": false,
"panels": [
{
"aliasColors": {
@@ -15720,12 +16079,17 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 1,
- "id": 6,
+ "gridPos": {
+
+ },
+ "id": 10,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": true,
"total": false,
"values": false
@@ -15735,11 +16099,12 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
@@ -15753,8 +16118,7 @@ items:
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
- "legendLink": null,
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -15784,7 +16148,7 @@ items:
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
@@ -15793,7 +16157,7 @@ items:
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
},
@@ -15806,12 +16170,17 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 1,
- "id": 7,
+ "gridPos": {
+
+ },
+ "id": 11,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": true,
"total": false,
"values": false
@@ -15821,11 +16190,12 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
@@ -15839,8 +16209,7 @@ items:
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
- "legendLink": null,
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -15870,7 +16239,7 @@ items:
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
@@ -15879,7 +16248,7 @@ items:
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
},
@@ -15892,12 +16261,17 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 1,
- "id": 8,
+ "gridPos": {
+
+ },
+ "id": 12,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": true,
"total": false,
"values": false
@@ -15907,11 +16281,12 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
@@ -15925,8 +16300,7 @@ items:
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
- "legendLink": null,
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -15956,7 +16330,7 @@ items:
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
@@ -15965,7 +16339,7 @@ items:
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
},
@@ -15978,12 +16352,17 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 1,
- "id": 9,
+ "gridPos": {
+
+ },
+ "id": 13,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": true,
"total": false,
"values": false
@@ -15993,11 +16372,12 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
@@ -16011,8 +16391,7 @@ items:
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
- "legendLink": null,
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -16042,7 +16421,7 @@ items:
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
@@ -16051,7 +16430,7 @@ items:
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
}
@@ -16060,8 +16439,9 @@ items:
"repeatIteration": null,
"repeatRowId": null,
"showTitle": true,
- "title": "Misc Rates.",
- "titleSize": "h6"
+ "title": "Misc. Rates",
+ "titleSize": "h6",
+ "type": "row"
}
],
"schemaVersion": 14,
@@ -16072,10 +16452,6 @@ items:
"templating": {
"list": [
{
- "current": {
- "text": "Prometheus",
- "value": "Prometheus"
- },
"hide": 0,
"label": null,
"name": "datasource",
@@ -16090,23 +16466,30 @@ items:
{
"allValue": null,
"current": {
- "selected": true,
- "text": "All",
- "value": "$__all"
+ "text": {
+ "selected": true,
+ "text": "All",
+ "value": "$__all"
+ },
+ "value": {
+ "selected": true,
+ "text": "All",
+ "value": "$__all"
+ }
},
"datasource": "$datasource",
"hide": 0,
"includeAll": true,
- "label": "instance",
- "multi": true,
+ "label": null,
+ "multi": false,
"name": "instance",
"options": [
],
"query": "label_values(prometheus_build_info, instance)",
- "refresh": 1,
+ "refresh": 2,
"regex": "",
- "sort": 2,
+ "sort": 0,
"tagValuesQuery": "",
"tags": [
@@ -16118,23 +16501,65 @@ items:
{
"allValue": null,
"current": {
- "selected": true,
- "text": "All",
- "value": "$__all"
+ "text": {
+ "selected": true,
+ "text": "All",
+ "value": "$__all"
+ },
+ "value": {
+ "selected": true,
+ "text": "All",
+ "value": "$__all"
+ }
},
"datasource": "$datasource",
"hide": 0,
"includeAll": true,
- "label": "cluster",
- "multi": true,
+ "label": null,
+ "multi": false,
"name": "cluster",
"options": [
],
"query": "label_values(kube_pod_container_info{image=~\".*prometheus.*\"}, cluster)",
- "refresh": 1,
+ "refresh": 2,
"regex": "",
- "sort": 2,
+ "sort": 0,
+ "tagValuesQuery": "",
+ "tags": [
+
+ ],
+ "tagsQuery": "",
+ "type": "query",
+ "useTags": false
+ },
+ {
+ "allValue": null,
+ "current": {
+ "text": {
+ "selected": true,
+ "text": "All",
+ "value": "$__all"
+ },
+ "value": {
+ "selected": true,
+ "text": "All",
+ "value": "$__all"
+ }
+ },
+ "datasource": "$datasource",
+ "hide": 0,
+ "includeAll": true,
+ "label": null,
+ "multi": false,
+ "name": "queue",
+ "options": [
+
+ ],
+ "query": "label_values(prometheus_remote_storage_shards, queue)",
+ "refresh": 2,
+ "regex": "",
+ "sort": 0,
"tagValuesQuery": "",
"tags": [
@@ -16146,7 +16571,7 @@ items:
]
},
"time": {
- "from": "now-1h",
+ "from": "now-6h",
"to": "now"
},
"timepicker": {
@@ -16174,9 +16599,8 @@ items:
"30d"
]
},
- "timezone": "utc",
+ "timezone": "browser",
"title": "Prometheus Remote Write",
- "uid": "",
"version": 0
}
kind: ConfigMap