Skip to content

Commit

Permalink
Get rid of the app label in Atlas dashboards (#562)
Browse files Browse the repository at this point in the history 
Co-authored-by: Quentin Bisson <[email protected]>
  • Loading branch information
@marieroque @QuentinBisson
marieroque and QuentinBisson authored Jun 4, 2024
1 parent 834dc75 commit e6923a1
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 55 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- Move SLO reporting dashboard to be public.
- Get rid of the `app` label in Atlas dashboards.

### Fixed

Expand Down Expand Up @@ -136,7 +137,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added

- Add a CAPA aggregated error logs dashboard.

## [3.10.4] - 2024-04-10

### Fixed
Expand Down Expand Up @@ -579,7 +580,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Add AWS ENA Performance
- Add AWS ENA Performance
- Updated team labels for team-rocket
- Add graph in Node Overview to identify emptydir growth
- Update kube-mixins to 0.12
Expand Down
4 changes: 2 additions & 2 deletions helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/loki-operational.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2620,7 +2620,7 @@
"uid": "$datasource"
},
"editorMode": "code",
"expr": "1-\n(\n sum without(instance, node) (kubelet_volume_stats_available_bytes{cluster_id=\"$cluster_id\", app=\"kubelet\", namespace=~\"$namespace\", persistentvolumeclaim=~\"data-loki-write-.*\"})\n /\n sum without(instance, node) (kubelet_volume_stats_capacity_bytes{cluster_id=\"$cluster_id\", app=\"kubelet\", namespace=~\"$namespace\", persistentvolumeclaim=~\"data-loki-write-.*\"})\n)\n",
"expr": "1-\n(\n sum without(instance, node) (kubelet_volume_stats_available_bytes{cluster_id=\"$cluster_id\", job=\"kubelet\", namespace=~\"$namespace\", persistentvolumeclaim=~\"data-loki-write-.*\"})\n /\n sum without(instance, node) (kubelet_volume_stats_capacity_bytes{cluster_id=\"$cluster_id\", job=\"kubelet\", namespace=~\"$namespace\", persistentvolumeclaim=~\"data-loki-write-.*\"})\n)\n",
"hide": false,
"instant": false,
"legendFormat": "{{persistentvolumeclaim}}",
Expand Down Expand Up @@ -4246,7 +4246,7 @@
"uid": "$datasource"
},
"editorMode": "code",
"expr": "1-\n(\n sum without(instance, node) (kubelet_volume_stats_available_bytes{cluster_id=\"$cluster_id\", app=\"kubelet\", namespace=~\"$namespace\", persistentvolumeclaim=~\"data-loki-backend-.*\"})\n /\n sum without(instance, node) (kubelet_volume_stats_capacity_bytes{cluster_id=\"$cluster_id\", app=\"kubelet\", namespace=~\"$namespace\", persistentvolumeclaim=~\"data-loki-backend-.*\"})\n)\n",
"expr": "1-\n(\n sum without(instance, node) (kubelet_volume_stats_available_bytes{cluster_id=\"$cluster_id\", job=\"kubelet\", namespace=~\"$namespace\", persistentvolumeclaim=~\"data-loki-backend-.*\"})\n /\n sum without(instance, node) (kubelet_volume_stats_capacity_bytes{cluster_id=\"$cluster_id\", job=\"kubelet\", namespace=~\"$namespace\", persistentvolumeclaim=~\"data-loki-backend-.*\"})\n)\n",
"hide": false,
"instant": false,
"legendFormat": "{{persistentvolumeclaim}}",
Expand Down
36 changes: 18 additions & 18 deletions helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/operatorkit.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
},
"editorMode": "code",
"exemplar": false,
"expr": "sum(rate(operatorkit_controller_operation_bucket{app=\"$app\", operation=\"$operation\"}[$__rate_interval])) by (le)",
"expr": "sum(rate(operatorkit_controller_operation_bucket{job=\"$job\", operation=\"$operation\"}[$__rate_interval])) by (le)",
"format": "heatmap",
"instant": false,
"legendFormat": "__auto",
Expand Down Expand Up @@ -287,7 +287,7 @@
"type": "prometheus",
"uid": "${datasource}"
},
"expr": "histogram_quantile(0.99, sum(irate(operatorkit_controller_operation_bucket{app=\"$app\", operation=\"$operation\"}[5m])) by (app, event, le))",
"expr": "histogram_quantile(0.99, sum(irate(operatorkit_controller_operation_bucket{job=\"$job\", operation=\"$operation\"}[5m])) by (job, event, le))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "99%",
Expand All @@ -300,7 +300,7 @@
"type": "prometheus",
"uid": "${datasource}"
},
"expr": "histogram_quantile(0.9, sum(irate(operatorkit_controller_operation_bucket{app=\"$app\", operation=\"$operation\"}[5m])) by (app, operation, le))",
"expr": "histogram_quantile(0.9, sum(irate(operatorkit_controller_operation_bucket{job=\"$job\", operation=\"$operation\"}[5m])) by (job, operation, le))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "90%",
Expand All @@ -312,7 +312,7 @@
"type": "prometheus",
"uid": "${datasource}"
},
"expr": "histogram_quantile(0.75, sum(irate(operatorkit_controller_operation_bucket{app=\"$app\", operation=\"$operation\"}[5m])) by (app, operation, le))",
"expr": "histogram_quantile(0.75, sum(irate(operatorkit_controller_operation_bucket{job=\"$job\", operation=\"$operation\"}[5m])) by (job, operation, le))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "75%",
Expand Down Expand Up @@ -429,7 +429,7 @@
},
"editorMode": "code",
"exemplar": false,
"expr": "sum(rate(operatorkit_controller_event_bucket{app=\"$app\", event=\"$event\"}[$__rate_interval])) by (le)",
"expr": "sum(rate(operatorkit_controller_event_bucket{job=\"$job\", event=\"$event\"}[$__rate_interval])) by (le)",
"format": "heatmap",
"instant": false,
"legendFormat": "__auto",
Expand Down Expand Up @@ -546,7 +546,7 @@
"type": "prometheus",
"uid": "${datasource}"
},
"expr": "histogram_quantile(0.99, sum(irate(operatorkit_controller_event_bucket{app=\"$app\", event=\"$event\"}[5m])) by (app, event, le))",
"expr": "histogram_quantile(0.99, sum(irate(operatorkit_controller_event_bucket{job=\"$job\", event=\"$event\"}[5m])) by (job, event, le))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "99%",
Expand All @@ -559,7 +559,7 @@
"type": "prometheus",
"uid": "${datasource}"
},
"expr": "histogram_quantile(0.9, sum(irate(operatorkit_controller_event_bucket{app=\"$app\", event=\"$event\"}[5m])) by (app, event, le))",
"expr": "histogram_quantile(0.9, sum(irate(operatorkit_controller_event_bucket{job=\"$job\", event=\"$event\"}[5m])) by (job, event, le))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "90%",
Expand All @@ -571,7 +571,7 @@
"type": "prometheus",
"uid": "${datasource}"
},
"expr": "histogram_quantile(0.75, sum(irate(operatorkit_controller_event_bucket{app=\"$app\", event=\"$event\"}[5m])) by (app, event, le))",
"expr": "histogram_quantile(0.75, sum(irate(operatorkit_controller_event_bucket{job=\"$job\", event=\"$event\"}[5m])) by (job, event, le))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "75%",
Expand Down Expand Up @@ -687,7 +687,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(operatorkit_controller_error_total{app=\"$app\"}) by (instance)",
"expr": "sum(operatorkit_controller_error_total{job=\"$job\"}) by (instance)",
"format": "time_series",
"interval": "",
"intervalFactor": 2,
Expand All @@ -703,7 +703,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(operatorkit_controller_errors_total{app=\"$app\"}) by (pod)",
"expr": "sum(operatorkit_controller_errors_total{job=\"$job\"}) by (pod)",
"hide": false,
"legendFormat": "pod {{pod}}",
"range": true,
Expand Down Expand Up @@ -807,7 +807,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(changes(giantswarm_build_info{app=\"$app\"}[5m])) by (commit, golang_version, version) + 1",
"expr": "sum(changes(giantswarm_build_info{job=\"$job\"}[5m])) by (commit, golang_version, version) + 1",
"format": "table",
"intervalFactor": 2,
"legendFormat": "{{version}} - {{golang_version}} - {{commit}}",
Expand Down Expand Up @@ -910,14 +910,14 @@
"type": "prometheus",
"uid": "${datasource}"
},
"definition": "label_values(operatorkit_controller_event_count, app)",
"definition": "label_values(operatorkit_controller_event_count, job)",
"hide": 0,
"includeAll": false,
"multi": false,
"name": "app",
"name": "job",
"options": [],
"query": {
"query": "label_values(operatorkit_controller_event_count, app)",
"query": "label_values(operatorkit_controller_event_count, job)",
"refId": "StandardVariableQuery"
},
"refresh": 2,
Expand All @@ -940,14 +940,14 @@
"type": "prometheus",
"uid": "${datasource}"
},
"definition": "label_values(operatorkit_controller_event_count{app=\"$app\"}, event)",
"definition": "label_values(operatorkit_controller_event_count{job=\"$job\"}, event)",
"hide": 0,
"includeAll": true,
"multi": true,
"name": "event",
"options": [],
"query": {
"query": "label_values(operatorkit_controller_event_count{app=\"$app\"}, event)",
"query": "label_values(operatorkit_controller_event_count{job=\"$job\"}, event)",
"refId": "StandardVariableQuery"
},
"refresh": 2,
Expand All @@ -970,14 +970,14 @@
"type": "prometheus",
"uid": "${datasource}"
},
"definition": "label_values(operatorkit_controller_operation_count{app=\"$app\"}, operation)",
"definition": "label_values(operatorkit_controller_operation_count{job=\"$job\"}, operation)",
"hide": 0,
"includeAll": true,
"multi": true,
"name": "operation",
"options": [],
"query": {
"query": "label_values(operatorkit_controller_operation_count{app=\"$app\"}, operation)",
"query": "label_values(operatorkit_controller_operation_count{job=\"$job\"}, operation)",
"refId": "StandardVariableQuery"
},
"refresh": 2,
Expand Down
6 changes: 3 additions & 3 deletions ...ds/charts/private_dashboards_mz/dashboards/shared/private/prometheus-cost-estimation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "max (\n kubelet_volume_stats_capacity_bytes{cluster_type=~\"management_cluster\", app=\"kubelet\", persistentvolumeclaim=~\"prometheus-($cluster)-db-prometheus-($cluster)-.*\"}\n - \n kubelet_volume_stats_available_bytes{cluster_type=~\"management_cluster\", app=\"kubelet\", persistentvolumeclaim=~\"prometheus-($cluster)-db-prometheus-($cluster)-.*\"}\n ) by (persistentvolumeclaim)",
"expr": "max (\n kubelet_volume_stats_capacity_bytes{cluster_type=~\"management_cluster\", job=\"kubelet\", persistentvolumeclaim=~\"prometheus-($cluster)-db-prometheus-($cluster)-.*\"}\n - \n kubelet_volume_stats_available_bytes{cluster_type=~\"management_cluster\", job=\"kubelet\", persistentvolumeclaim=~\"prometheus-($cluster)-db-prometheus-($cluster)-.*\"}\n ) by (persistentvolumeclaim)",
"legendFormat": "{{persistentvolumeclaim}}",
"range": true,
"refId": "A"
Expand All @@ -761,7 +761,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(max (\n kubelet_volume_stats_capacity_bytes{cluster_type=~\"management_cluster\", app=\"kubelet\", persistentvolumeclaim=~\"prometheus-($cluster)-db-prometheus-($cluster)-.*\"}\n - \n kubelet_volume_stats_available_bytes{cluster_type=~\"management_cluster\", app=\"kubelet\", persistentvolumeclaim=~\"prometheus-($cluster)-db-prometheus-($cluster)-.*\"}\n ) by (persistentvolumeclaim))",
"expr": "sum(max (\n kubelet_volume_stats_capacity_bytes{cluster_type=~\"management_cluster\", job=\"kubelet\", persistentvolumeclaim=~\"prometheus-($cluster)-db-prometheus-($cluster)-.*\"}\n - \n kubelet_volume_stats_available_bytes{cluster_type=~\"management_cluster\", job=\"kubelet\", persistentvolumeclaim=~\"prometheus-($cluster)-db-prometheus-($cluster)-.*\"}\n ) by (persistentvolumeclaim))",
"hide": false,
"legendFormat": "Total space used",
"range": true,
Expand Down Expand Up @@ -830,7 +830,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(max (\n kubelet_volume_stats_capacity_bytes{cluster_type=~\"management_cluster\", app=\"kubelet\", persistentvolumeclaim=~\"prometheus-($cluster)-db-prometheus-($cluster)-.*\"}\n - \n kubelet_volume_stats_available_bytes{cluster_type=~\"management_cluster\", app=\"kubelet\", persistentvolumeclaim=~\"prometheus-($cluster)-db-prometheus-($cluster)-.*\"}\n ) by (persistentvolumeclaim))",
"expr": "sum(max (\n kubelet_volume_stats_capacity_bytes{cluster_type=~\"management_cluster\", job=\"kubelet\", persistentvolumeclaim=~\"prometheus-($cluster)-db-prometheus-($cluster)-.*\"}\n - \n kubelet_volume_stats_available_bytes{cluster_type=~\"management_cluster\", job=\"kubelet\", persistentvolumeclaim=~\"prometheus-($cluster)-db-prometheus-($cluster)-.*\"}\n ) by (persistentvolumeclaim))",
"legendFormat": "__auto",
"range": true,
"refId": "A"
Expand Down
12 changes: 6 additions & 6 deletions helm/dashboards/charts/public_dashboards/dashboards/shared/public/pod-request-vs-usage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
},
"editorMode": "code",
"exemplar": false,
"expr": "sort(\n bottomk(10,\n max(\n label_replace(\n avg_over_time(\n container_memory_working_set_bytes{app=\"cadvisor\", cluster_id=\"$cluster\", namespace=\"$namespace\",container!=\"\", image!=\"\", pod=~\"($container).*\"}[$__range]\n ),\"shortpod\",\"$1\",\"pod\",\"(.*)-.*\"\n )\n ) by (shortpod)\n /\n max(\n label_replace(\n cluster:namespace:pod_memory:active:kube_pod_container_resource_requests{cluster_id=\"$cluster\", namespace=\"$namespace\", pod=~\"($container).*\"}\n ,\"shortpod\",\"$1\",\"pod\",\"(.*)-.*\"\n )\n ) by (shortpod)\n *100)\n)",
"expr": "sort(\n bottomk(10,\n max(\n label_replace(\n avg_over_time(\n container_memory_working_set_bytes{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster_id=\"$cluster\", namespace=\"$namespace\",container!=\"\", image!=\"\", pod=~\"($container).*\"}[$__range]\n ),\"shortpod\",\"$1\",\"pod\",\"(.*)-.*\"\n )\n ) by (shortpod)\n /\n max(\n label_replace(\n cluster:namespace:pod_memory:active:kube_pod_container_resource_requests{cluster_id=\"$cluster\", namespace=\"$namespace\", pod=~\"($container).*\"}\n ,\"shortpod\",\"$1\",\"pod\",\"(.*)-.*\"\n )\n ) by (shortpod)\n *100)\n)",
"hide": false,
"instant": true,
"interval": "",
Expand Down Expand Up @@ -383,7 +383,7 @@
},
"editorMode": "code",
"exemplar": true,
"expr": "max(label_replace(container_memory_working_set_bytes{app=\"cadvisor\", cluster_id=\"$cluster\", namespace=\"$namespace\",container!=\"\", image!=\"\", pod=~\"($container).*\"},\"shortpod\",\"$1\",\"pod\",\"(.*)-.*\")) by (shortpod)",
"expr": "max(label_replace(container_memory_working_set_bytes{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster_id=\"$cluster\", namespace=\"$namespace\",container!=\"\", image!=\"\", pod=~\"($container).*\"},\"shortpod\",\"$1\",\"pod\",\"(.*)-.*\")) by (shortpod)",
"interval": "",
"legendFormat": "usage for {{shortpod}}",
"range": true,
Expand Down Expand Up @@ -432,15 +432,15 @@
"type": "prometheus",
"uid": "$datasource"
},
"definition": "label_values(up{app=\"kube-state-metrics\"}, cluster_id)",
"definition": "label_values(up{job=\"kube-state-metrics\"}, cluster_id)",
"hide": 0,
"includeAll": false,
"label": "Cluster",
"multi": false,
"name": "cluster",
"options": [],
"query": {
"query": "label_values(up{app=\"kube-state-metrics\"}, cluster_id)",
"query": "label_values(up{job=\"kube-state-metrics\"}, cluster_id)",
"refId": "StandardVariableQuery"
},
"refresh": 2,
Expand All @@ -462,14 +462,14 @@
"type": "prometheus",
"uid": "$datasource"
},
"definition": "label_values(kube_namespace_status_phase{app=\"kube-state-metrics\", cluster_id=\"$cluster\"}, namespace)",
"definition": "label_values(kube_namespace_status_phase{job=\"kube-state-metrics\", cluster_id=\"$cluster\"}, namespace)",
"hide": 0,
"includeAll": false,
"multi": false,
"name": "namespace",
"options": [],
"query": {
"query": "label_values(kube_namespace_status_phase{app=\"kube-state-metrics\", cluster_id=\"$cluster\"}, namespace)",
"query": "label_values(kube_namespace_status_phase{job=\"kube-state-metrics\", cluster_id=\"$cluster\"}, namespace)",
"refId": "StandardVariableQuery"
},
"refresh": 2,
Expand Down
Loading

0 comments on commit e6923a1

Please sign in to comment.