Skip to content

Commit

Permalink
Reviewed labels used in turtles dashboards. (#573)
Browse files Browse the repository at this point in the history 
* Reviewed labels used in turtles dashboards.

* Updated turtles mixins dashboards
  • Loading branch information
@weseven
weseven authored Jun 10, 2024
1 parent 59ffdab commit 6ab98a6
Show file tree
Hide file tree
Showing 13 changed files with 199 additions and 198 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Replace Cluster ID with cluster in dashboard labels.
- remotewrite: improve legends
- remotewrite: add count of agent replicas
- Reviewed labels used in turtles dashboards
- servicemonitors-overview: add info about agent pods

### Fixed
Expand Down
4 changes: 2 additions & 2 deletions ...hboards/charts/private_dashboards_al/dashboards/shared/private/kubernetes-api-uptime.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
],
"targets": [
{
"expr": "sum(sum_over_time(up{cluster_type=~\"workload_cluster\",app=\"kubernetes\"}[1w])) by (cluster_id) / sum(count_over_time(up{cluster_type=~\"workload_cluster\",app=\"kubernetes\"}[1w])) by (cluster_id)",
"expr": "sum(sum_over_time(up{cluster_type=~\"workload_cluster\",job=\"apiserver\"}[1w])) by (cluster_id) / sum(count_over_time(up{cluster_type=~\"workload_cluster\",job=\"apiserver\"}[1w])) by (cluster_id)",
"format": "table",
"instant": true,
"intervalFactor": 2,
Expand Down Expand Up @@ -148,7 +148,7 @@
"steppedLine": false,
"targets": [
{
"expr": "1 - up{cluster_type=\"workload_cluster\",app=\"kubernetes\"}",
"expr": "1 - up{cluster_type=\"workload_cluster\",job=\"apiserver\"}",
"format": "time_series",
"intervalFactor": 2,
"refId": "A"
Expand Down
8 changes: 4 additions & 4 deletions helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/persistentvolume.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1535,15 +1535,15 @@
"type": "prometheus",
"uid": "$datasource"
},
"definition": "label_values(kubelet_volume_stats_capacity_bytes{app=\"kubelet\"},cluster_id)",
"definition": "label_values(kubelet_volume_stats_capacity_bytes{job=\"kubelet\"},cluster_id)",
"hide": 0,
"includeAll": false,
"label": "Cluster",
"multi": false,
"name": "cluster_id",
"options": [],
"query": {
"query": "label_values(kubelet_volume_stats_capacity_bytes{app=\"kubelet\"},cluster_id)",
"query": "label_values(kubelet_volume_stats_capacity_bytes{job=\"kubelet\"},cluster_id)",
"refId": "PrometheusVariableQueryEditor-VariableQuery"
},
"refresh": 1,
Expand All @@ -1567,15 +1567,15 @@
"type": "prometheus",
"uid": "$datasource"
},
"definition": "label_values(kubelet_volume_stats_capacity_bytes{app=\"kubelet\"},namespace)",
"definition": "label_values(kubelet_volume_stats_capacity_bytes{job=\"kubelet\"},namespace)",
"hide": 0,
"includeAll": true,
"label": "Namespace",
"multi": true,
"name": "namespace",
"options": [],
"query": {
"query": "label_values(kubelet_volume_stats_capacity_bytes{app=\"kubelet\"},namespace)",
"query": "label_values(kubelet_volume_stats_capacity_bytes{job=\"kubelet\"},namespace)",
"refId": "PrometheusVariableQueryEditor-VariableQuery"
},
"refresh": 2,
Expand Down
30 changes: 15 additions & 15 deletions helm/dashboards/dashboards/mixin/controller-manager.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"tableColumn": "",
"targets": [
{
"expr": "sum(up{cluster_id=\"$cluster\", app=\"kube-controller-manager\"})",
"expr": "sum(up{cluster_id=\"$cluster\", job=\"kube-controller-manager\"})",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "",
Expand Down Expand Up @@ -139,7 +139,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(rate(workqueue_adds_total{cluster_id=\"$cluster\", app=\"kube-controller-manager\", instance=~\"$instance\"}[$__rate_interval])) by (cluster_id, instance, name)",
"expr": "sum(rate(workqueue_adds_total{cluster_id=\"$cluster\", job=\"kube-controller-manager\", instance=~\"$instance\"}[$__rate_interval])) by (cluster_id, instance, name)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster_id}} {{instance}} {{name}}",
Expand Down Expand Up @@ -234,7 +234,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(rate(workqueue_depth{cluster_id=\"$cluster\", app=\"kube-controller-manager\", instance=~\"$instance\"}[$__rate_interval])) by (cluster_id, instance, name)",
"expr": "sum(rate(workqueue_depth{cluster_id=\"$cluster\", job=\"kube-controller-manager\", instance=~\"$instance\"}[$__rate_interval])) by (cluster_id, instance, name)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster_id}} {{instance}} {{name}}",
Expand Down Expand Up @@ -329,7 +329,7 @@
"steppedLine": false,
"targets": [
{
"expr": "histogram_quantile(0.99, sum(rate(workqueue_queue_duration_seconds_bucket{cluster_id=\"$cluster\", app=\"kube-controller-manager\", instance=~\"$instance\"}[$__rate_interval])) by (cluster_id, instance, name, le))",
"expr": "histogram_quantile(0.99, sum(rate(workqueue_queue_duration_seconds_bucket{cluster_id=\"$cluster\", job=\"kube-controller-manager\", instance=~\"$instance\"}[$__rate_interval])) by (cluster_id, instance, name, le))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster_id}} {{instance}} {{name}}",
Expand Down Expand Up @@ -424,28 +424,28 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(rate(rest_client_requests_total{app=\"kube-controller-manager\", instance=~\"$instance\",code=~\"2..\"}[$__rate_interval]))",
"expr": "sum(rate(rest_client_requests_total{job=\"kube-controller-manager\", instance=~\"$instance\",code=~\"2..\"}[$__rate_interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "2xx",
"refId": "A"
},
{
"expr": "sum(rate(rest_client_requests_total{app=\"kube-controller-manager\", instance=~\"$instance\",code=~\"3..\"}[$__rate_interval]))",
"expr": "sum(rate(rest_client_requests_total{job=\"kube-controller-manager\", instance=~\"$instance\",code=~\"3..\"}[$__rate_interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "3xx",
"refId": "B"
},
{
"expr": "sum(rate(rest_client_requests_total{app=\"kube-controller-manager\", instance=~\"$instance\",code=~\"4..\"}[$__rate_interval]))",
"expr": "sum(rate(rest_client_requests_total{job=\"kube-controller-manager\", instance=~\"$instance\",code=~\"4..\"}[$__rate_interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "4xx",
"refId": "C"
},
{
"expr": "sum(rate(rest_client_requests_total{app=\"kube-controller-manager\", instance=~\"$instance\",code=~\"5..\"}[$__rate_interval]))",
"expr": "sum(rate(rest_client_requests_total{job=\"kube-controller-manager\", instance=~\"$instance\",code=~\"5..\"}[$__rate_interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "5xx",
Expand Down Expand Up @@ -527,7 +527,7 @@
"steppedLine": false,
"targets": [
{
"expr": "histogram_quantile(0.99, sum(rate(rest_client_request_duration_seconds_bucket{cluster_id=\"$cluster\", app=\"kube-controller-manager\", instance=~\"$instance\", verb=\"POST\"}[$__rate_interval])) by (verb, url, le))",
"expr": "histogram_quantile(0.99, sum(rate(rest_client_request_duration_seconds_bucket{cluster_id=\"$cluster\", job=\"kube-controller-manager\", instance=~\"$instance\", verb=\"POST\"}[$__rate_interval])) by (verb, url, le))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{verb}} {{url}}",
Expand Down Expand Up @@ -622,7 +622,7 @@
"steppedLine": false,
"targets": [
{
"expr": "histogram_quantile(0.99, sum(rate(rest_client_request_duration_seconds_bucket{cluster_id=\"$cluster\", app=\"kube-controller-manager\", instance=~\"$instance\", verb=\"GET\"}[$__rate_interval])) by (verb, url, le))",
"expr": "histogram_quantile(0.99, sum(rate(rest_client_request_duration_seconds_bucket{cluster_id=\"$cluster\", job=\"kube-controller-manager\", instance=~\"$instance\", verb=\"GET\"}[$__rate_interval])) by (verb, url, le))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{verb}} {{url}}",
Expand Down Expand Up @@ -717,7 +717,7 @@
"steppedLine": false,
"targets": [
{
"expr": "process_resident_memory_bytes{cluster_id=\"$cluster\", app=\"kube-controller-manager\",instance=~\"$instance\"}",
"expr": "process_resident_memory_bytes{cluster_id=\"$cluster\", job=\"kube-controller-manager\",instance=~\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}}",
Expand Down Expand Up @@ -799,7 +799,7 @@
"steppedLine": false,
"targets": [
{
"expr": "rate(process_cpu_seconds_total{cluster_id=\"$cluster\", app=\"kube-controller-manager\",instance=~\"$instance\"}[$__rate_interval])",
"expr": "rate(process_cpu_seconds_total{cluster_id=\"$cluster\", job=\"kube-controller-manager\",instance=~\"$instance\"}[$__rate_interval])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}}",
Expand Down Expand Up @@ -881,7 +881,7 @@
"steppedLine": false,
"targets": [
{
"expr": "go_goroutines{cluster_id=\"$cluster\", app=\"kube-controller-manager\",instance=~\"$instance\"}",
"expr": "go_goroutines{cluster_id=\"$cluster\", job=\"kube-controller-manager\",instance=~\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}}",
Expand Down Expand Up @@ -966,7 +966,7 @@
"multi": false,
"name": "cluster",
"options": [],
"query": "label_values(up{app=\"kube-controller-manager\"}, cluster_id)",
"query": "label_values(up{job=\"kube-controller-manager\"}, cluster_id)",
"refresh": 2,
"regex": "",
"sort": 1,
Expand All @@ -986,7 +986,7 @@
"multi": false,
"name": "instance",
"options": [],
"query": "label_values(up{cluster_id=\"$cluster\", app=\"kube-controller-manager\"}, instance)",
"query": "label_values(up{cluster_id=\"$cluster\", job=\"kube-controller-manager\"}, instance)",
"refresh": 2,
"regex": "",
"sort": 1,
Expand Down
Loading

0 comments on commit 6ab98a6

Please sign in to comment.