Skip to content

Commit

Permalink
Fix/carbon dashboard 1 (#22)
Browse files Browse the repository at this point in the history 
* fix power metrics multi-cluster carbon dashboard

* bump version
  • Loading branch information
@eumel8
eumel8 authored Dec 10, 2024
1 parent d168af2 commit 4af17ba
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion chart/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ annotations:
catalog.cattle.io/display-name: CaaS Carbon Footprint
name: caas-carbon-footprint
description: A Helm chart for carbon footprint measurement
version: "0.0.16"
version: "0.0.17"
appVersion: "0.0.15"
keywords:
- monitoring
Expand Down
34 changes: 17 additions & 17 deletions chart/files/caas-carbon-dashboard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,7 @@
{
"datasource": "prometheus",
"editorMode": "code",
"expr": "sum by (pod_name, container_namespace) (irate(kepler_container_package_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\"}[5m]))",
"expr": "sum by (pod_name, container_namespace) (irate(kepler_container_package_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\", cluster=~\"$meta_cluster\"}[5m]))",
"hide": false,
"interval": "",
"legendFormat": "{{pod_name}} / {{container_namespace}} / PKG",
Expand All @@ -1015,7 +1015,7 @@
{
"datasource": "prometheus",
"editorMode": "code",
"expr": "sum by (pod_name, container_namespace) (irate(kepler_container_dram_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\"}[5m]))",
"expr": "sum by (pod_name, container_namespace) (irate(kepler_container_dram_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\", cluster=~\"$meta_cluster\"}[5m]))",
"hide": false,
"interval": "",
"legendFormat": "{{pod_name}} / {{container_namespace}} / DRAM",
Expand All @@ -1028,7 +1028,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum by (pod_name, container_namespace) (irate(kepler_container_other_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\"}[5m]))",
"expr": "sum by (pod_name, container_namespace) (irate(kepler_container_other_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\", cluster=~\"$meta_cluster\"}[5m]))",
"hide": false,
"interval": "",
"legendFormat": "{{pod_name}} / {{container_namespace}} / OTHER",
Expand All @@ -1041,7 +1041,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum by (pod_name, container_namespace) (irate(kepler_container_gpu_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\"}[5m]))",
"expr": "sum by (pod_name, container_namespace) (irate(kepler_container_gpu_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\", cluster=~\"$meta_cluster\"}[5m]))",
"hide": false,
"legendFormat": "{{pod_name}} / {{container_namespace}} / GPU",
"range": true,
Expand Down Expand Up @@ -1198,7 +1198,7 @@
{
"datasource": "prometheus",
"editorMode": "code",
"expr": "sum by (pod_name, container_namespace) (irate(kepler_container_package_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\"}[5m])*(entsoe_generation_co2*3600))",
"expr": "sum by (pod_name, container_namespace) (irate(kepler_container_package_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\", cluster=~\"$meta_cluster\"}[5m])*(entsoe_generation_co2*3600))",
"hide": false,
"interval": "",
"legendFormat": "{{pod_name}} / {{container_namespace}} / PKG",
Expand All @@ -1208,7 +1208,7 @@
{
"datasource": "prometheus",
"editorMode": "code",
"expr": "sum by (pod_name, container_namespace) (irate(kepler_container_dram_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\"}[5m])*($fosfactor/1000)*($ecofactor/1000))",
"expr": "sum by (pod_name, container_namespace) (irate(kepler_container_dram_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\", cluster=~\"$meta_cluster\"}[5m])*($fosfactor/1000)*($ecofactor/1000))",
"hide": false,
"interval": "",
"legendFormat": "{{pod_name}} / {{container_namespace}} / DRAM",
Expand All @@ -1221,7 +1221,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum by (pod_name, container_namespace) (irate(kepler_container_other_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\"}[5m])*($fosfactor/1000)*($ecofactor/1000))",
"expr": "sum by (pod_name, container_namespace) (irate(kepler_container_other_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\", cluster=~\"$meta_cluster\"}[5m])*($fosfactor/1000)*($ecofactor/1000))",
"hide": false,
"interval": "",
"legendFormat": "{{pod_name}} / {{container_namespace}} / OTHER",
Expand All @@ -1234,7 +1234,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum by (pod_name, container_namespace) (irate(kepler_container_gpu_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\"}[5m])*($fosfactor/1000)*($ecofactor/1000))",
"expr": "sum by (pod_name, container_namespace) (irate(kepler_container_gpu_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\", cluster=~\"$meta_cluster\"}[5m])*($fosfactor/1000)*($ecofactor/1000))",
"hide": false,
"legendFormat": "{{pod_name}} / {{container_namespace}} / GPU",
"range": true,
Expand Down Expand Up @@ -1393,7 +1393,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(irate(kepler_container_package_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\"}[5m]))",
"expr": "sum(irate(kepler_container_package_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\", cluster=~\"$meta_cluster\"}[5m]))",
"hide": false,
"interval": "",
"legendFormat": "PKG",
Expand All @@ -1406,7 +1406,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(irate(kepler_container_dram_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\"}[5m]))",
"expr": "sum(irate(kepler_container_dram_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\", cluster=~\"$meta_cluster\"}[5m]))",
"hide": false,
"interval": "",
"legendFormat": "DRAM",
Expand All @@ -1419,7 +1419,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(irate(kepler_container_other_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\"}[5m]))",
"expr": "sum(irate(kepler_container_other_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\", cluster=~\"$meta_cluster\"}[5m]))",
"hide": false,
"legendFormat": "OTHER",
"range": true,
Expand All @@ -1431,7 +1431,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(irate(kepler_container_gpu_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\"}[5m]))",
"expr": "sum(irate(kepler_container_gpu_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\", cluster=~\"$meta_cluster\"}[5m]))",
"hide": false,
"legendFormat": " GPU",
"range": true,
Expand Down Expand Up @@ -1592,7 +1592,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum (\n increase(\n (kepler_container_package_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\"}[24h:1m])\n )\n) * $watt_per_second_to_kWh",
"expr": "sum (\n increase(\n (kepler_container_package_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\", cluster=~\"$meta_cluster\"}[24h:1m])\n )\n) * $watt_per_second_to_kWh",
"hide": false,
"interval": "",
"legendFormat": "PKG (CORE+UNCORE)",
Expand All @@ -1605,7 +1605,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum (\n increase(\n (kepler_container_dram_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\"}[24h:1m])\n )\n) * $watt_per_second_to_kWh",
"expr": "sum (\n increase(\n (kepler_container_dram_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\", cluster=~\"$meta_cluster\"}[24h:1m])\n )\n) * $watt_per_second_to_kWh",
"hide": false,
"interval": "",
"legendFormat": "DRAM",
Expand All @@ -1618,7 +1618,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum (\n increase(\n (kepler_container_other_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\"}[24h:1m])\n )\n) * $watt_per_second_to_kWh",
"expr": "sum (\n increase(\n (kepler_container_other_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\", cluster=~\"$meta_cluster\"}[24h:1m])\n )\n) * $watt_per_second_to_kWh",
"hide": false,
"legendFormat": "OTHER",
"range": true,
Expand All @@ -1630,7 +1630,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum (\n increase(\n (kepler_container_gpu_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\"}[24h:1m])\n )\n) * $watt_per_second_to_kWh",
"expr": "sum (\n increase(\n (kepler_container_gpu_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\", cluster=~\"$meta_cluster\"}[24h:1m])\n )\n) * $watt_per_second_to_kWh",
"hide": false,
"legendFormat": " GPU",
"range": true,
Expand Down Expand Up @@ -1696,7 +1696,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum by (container_namespace)(\n (\n increase(kepler_container_dram_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\"}[24h:1m]) +\n increase(kepler_container_other_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\"}[24h:1m]) +\n increase(kepler_container_package_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\"}[24h:1m])\n ) * $watt_per_second_to_kWh\n)",
"expr": "sum by (container_namespace)(\n (\n increase(kepler_container_dram_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\", cluster=~\"$meta_cluster\"}[24h:1m]) +\n increase(kepler_container_other_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\", cluster=~\"$meta_cluster\"}[24h:1m]) +\n increase(kepler_container_package_joules_total{container_namespace=~\"$namespace\", pod_name=~\"$pod\", cluster=~\"$meta_cluster\"}[24h:1m])\n ) * $watt_per_second_to_kWh\n)",
"interval": "",
"legendFormat": "{{container_namespace}}",
"range": true,
Expand Down

0 comments on commit 4af17ba

Please sign in to comment.