Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mimir-prometheus-comparator #466

Merged
merged 1 commit into from
Mar 26, 2024
Merged

Fix mimir-prometheus-comparator #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed

- Fix all dashboards that were only supporting only role=master to now support role=~control-plane|master.
- Fix Mimir - Prometheus cost dashboard to compare over real data (not missing on data from old prometheus instances)

## [3.8.4] - 2024-03-11

Expand Down
49 changes: 7 additions & 42 deletions .../charts/private_dashboards_mz/dashboards/shared/private/prometheus-mimir-comparative.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"uid": "PBFA97CFB590B2093"
},
"editorMode": "code",
"expr": "sum(rate(container_cpu_usage_seconds_total{container=\"prometheus\", pod=~\"prometheus-($cluster)-.*\", cluster_type=~\"management_cluster\"}[5m]))",
"expr": "sum(rate(container_cpu_usage_seconds_total{container=\"prometheus\", namespace=~\".*-prometheus\", cluster_type=~\"management_cluster\"}[$__range]))",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use the namespace instead of the live prometheus as this condition is missing a lot of historical data especially on test MCs where clusters are created/deleted multiple times a day

"legendFormat": "__auto",
"range": true,
"refId": "A"
Expand Down Expand Up @@ -162,7 +162,7 @@
"uid": "PBFA97CFB590B2093"
},
"editorMode": "code",
"expr": "sum(max_over_time(\n container_memory_usage_bytes{container=\"prometheus\", pod=~\"prometheus-($cluster).*\", cluster_type=~\"management_cluster\"}[$__range]\n))",
"expr": "sum(max_over_time(container_memory_usage_bytes{container=\"prometheus\", namespace=~\".*-prometheus\", cluster_type=~\"management_cluster\"}[$__range]))",
"legendFormat": "__auto",
"range": true,
"refId": "A"
Expand Down Expand Up @@ -256,7 +256,7 @@
"uid": "PBFA97CFB590B2093"
},
"editorMode": "code",
"expr": "sum(irate(container_network_receive_bytes_total{pod=~\"prometheus-($cluster)-.*\"}[5m])) by (pod)",
"expr": "sum(irate(container_network_receive_bytes_total{namespace=~\".*-prometheus\"}[$__range])) by (pod)",
"legendFormat": "{{pod}}",
"range": true,
"refId": "A"
Expand Down Expand Up @@ -350,7 +350,7 @@
"uid": "PBFA97CFB590B2093"
},
"editorMode": "code",
"expr": "sum(irate(container_network_transmit_bytes_total{pod=~\"prometheus-($cluster)-.*\"}[5m])) by (pod)",
"expr": "sum(irate(container_network_transmit_bytes_total{namespace=~\".*-prometheus\"}[$__range])) by (pod)",
"legendFormat": "{{pod}}",
"range": true,
"refId": "A"
Expand Down Expand Up @@ -432,7 +432,7 @@
},
"editorMode": "code",
"exemplar": false,
"expr": "sum(sum(rate(container_cpu_usage_seconds_total{pod=~\"mimir-.*\", cluster_type=~\"management_cluster\"}[5m])) by (pod))",
"expr": "sum(sum(rate(container_cpu_usage_seconds_total{pod=~\"mimir-.*\", cluster_type=~\"management_cluster\"}[$__range])) by (pod))",
"instant": false,
"legendFormat": "__auto",
"range": true,
Expand Down Expand Up @@ -595,7 +595,7 @@
"uid": "PBFA97CFB590B2093"
},
"editorMode": "code",
"expr": "sum(irate(container_network_receive_bytes_total{pod=~\"mimir-.*\"}[5m])) by (pod)",
"expr": "sum(irate(container_network_receive_bytes_total{pod=~\"mimir-.*\"}[$__range])) by (pod)",
"legendFormat": "{{pod}}",
"range": true,
"refId": "A"
Expand Down Expand Up @@ -689,7 +689,7 @@
"uid": "PBFA97CFB590B2093"
},
"editorMode": "code",
"expr": "sum(irate(container_network_transmit_bytes_total{pod=~\"mimir-.*\"}[5m])) by (pod)",
"expr": "sum(irate(container_network_transmit_bytes_total{pod=~\"mimir-.*\"}[$__range])) by (pod)",
"legendFormat": "{{pod}}",
"range": true,
"refId": "A"
Expand All @@ -703,41 +703,6 @@
"schemaVersion": 38,
"style": "dark",
"tags": [],
"templating": {
"list": [
{
"allValue": "",
"current": {
"selected": true,
"text": [
"All"
],
"value": [
"$__all"
]
},
"datasource": {
"type": "prometheus",
"uid": "PBFA97CFB590B2093"
},
"definition": "label_values(kube_pod_container_info{image=~\".*prometheus.*\"},cluster_id)",
"hide": 0,
"includeAll": true,
"multi": true,
"name": "cluster",
"options": [],
"query": {
"query": "label_values(kube_pod_container_info{image=~\".*prometheus.*\"},cluster_id)",
"refId": "PrometheusVariableQueryEditor-VariableQuery"
},
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 0,
"type": "query"
}
]
},
"time": {
"from": "now-7d",
"to": "now"
Expand Down