Skip to content

Commit

Permalink
Merge pull request #32 from empathyco/fix/uid-dashboard
Browse files Browse the repository at this point in the history 
Adding Datasource variable
  • Loading branch information
@kaskol10
kaskol10 committed Apr 14, 2022
2 parents b86666f + 1153844 commit 6043836
Show file tree
Hide file tree
Showing 3 changed files with 4,402 additions and 4,321 deletions.
2 changes: 1 addition & 1 deletion charts/kubernetes-cost-report/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.0.3
version: 0.0.4

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
93 changes: 79 additions & 14 deletions charts/kubernetes-cost-report/dashboards/exec-kubernetes-cost-report.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"version": ""
}
],
"annotations": {
"annotations": {
"list": [
{
"builtIn": 1,
Expand All @@ -57,6 +57,7 @@
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 0,
"iteration": 1649926460792,
"links": [],
"liveNow": true,
"panels": [
Expand All @@ -74,6 +75,10 @@
"type": "row"
},
{
"datasource": {
"type": "prometheus",
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
"color": {
Expand Down Expand Up @@ -122,7 +127,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
"uid": "${datasource}"
},
"exemplar": false,
"expr": "sum(\n sum_over_time(\n (\n capacity_instance:spot_instance_cost:cost \n OR \n capacity_instance:on_demand_instance_cost:cost\n )\n [1d:1h])\n)",
Expand All @@ -145,6 +150,10 @@
"type": "gauge"
},
{
"datasource": {
"type": "prometheus",
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
"color": {
Expand Down Expand Up @@ -194,7 +203,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
"uid": "${datasource}"
},
"exemplar": false,
"expr": "sum(\n sum_over_time(\n (\n capacity_instance:spot_instance_cost:cost \n OR \n capacity_instance:on_demand_instance_cost:cost\n )\n [3d:1h])\n)*10",
Expand Down Expand Up @@ -229,6 +238,10 @@
"type": "row"
},
{
"datasource": {
"type": "prometheus",
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
"color": {
Expand Down Expand Up @@ -298,7 +311,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
"uid": "${datasource}"
},
"exemplar": false,
"expr": "topk(6,\n sum_over_time(\n sum by (namespace) (\n # See description for label_replace\n label_replace(\n zone_capacity_instance_namespace_node_pod:pod_cpu_requests_instance_cpu_price:spot_pod_cpu_requests_cost\n OR\n capacity_instance_namespace_node_pod:pod_cpu_requests_instance_cpu_price:on_demand_pod_cpu_requests_cost\n , \"resource\", \"CPU\", \"\",\"\")\n \n OR \n \n label_replace(\n zone_capacity_instance_namespace_node_pod:pod_memory_requests_instance_mem_price:spot_pod_mem_requests_cost\n OR\n capacity_instance_namespace_node_pod:pod_memory_requests_instance_mem_price:on_demand_pod_mem_requests_cost\n , \"resource\", \"memory\", \"\",\"\")\n\n )\n [1d:1h])\n)",
Expand Down Expand Up @@ -343,6 +356,10 @@
"type": "barchart"
},
{
"datasource": {
"type": "prometheus",
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
"color": {
Expand Down Expand Up @@ -412,7 +429,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
"uid": "${datasource}"
},
"exemplar": false,
"expr": "topk(6,\n sum_over_time(\n sum by (namespace) (\n zone_capacity_instance_namespace_node_pod:pod_cpu_requests_instance_cpu_price:spot_pod_cpu_requests_cost\n OR\n capacity_instance_namespace_node_pod:pod_cpu_requests_instance_cpu_price:on_demand_pod_cpu_requests_cost\n )\n [1d:1h])\n)",
Expand Down Expand Up @@ -457,6 +474,10 @@
"type": "barchart"
},
{
"datasource": {
"type": "prometheus",
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
"color": {
Expand Down Expand Up @@ -526,7 +547,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
"uid": "${datasource}"
},
"exemplar": false,
"expr": "topk(6,\n sum_over_time(\n sum by (namespace) ( \n zone_capacity_instance_namespace_node_pod:pod_memory_requests_instance_mem_price:spot_pod_mem_requests_cost\n OR\n capacity_instance_namespace_node_pod:pod_memory_requests_instance_mem_price:on_demand_pod_mem_requests_cost\n )\n [1d:1h])\n)",
Expand Down Expand Up @@ -571,6 +592,10 @@
"type": "barchart"
},
{
"datasource": {
"type": "prometheus",
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
"color": {
Expand Down Expand Up @@ -640,7 +665,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
"uid": "${datasource}"
},
"exemplar": false,
"expr": "topk(10,\nsum_over_time(\n sum by (pod) (\n # See description for label_replace\n label_replace(\n\t\t zone_capacity_instance_namespace_node_pod:pod_cpu_requests_instance_cpu_price:spot_pod_cpu_requests_cost\n OR\n capacity_instance_namespace_node_pod:pod_cpu_requests_instance_cpu_price:on_demand_pod_cpu_requests_cost\n , \"resource\", \"CPU\", \"\",\"\")\n \n OR \n \n label_replace(\n\t\t zone_capacity_instance_namespace_node_pod:pod_memory_requests_instance_mem_price:spot_pod_mem_requests_cost\n OR\n capacity_instance_namespace_node_pod:pod_memory_requests_instance_mem_price:on_demand_pod_mem_requests_cost\n , \"resource\", \"memory\", \"\",\"\")\n\n\t)\n[1d:1h])\n)",
Expand Down Expand Up @@ -690,6 +715,10 @@
"type": "barchart"
},
{
"datasource": {
"type": "prometheus",
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
"color": {
Expand Down Expand Up @@ -759,7 +788,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
"uid": "${datasource}"
},
"exemplar": false,
"expr": "topk(6,sum by (namespace) (sum by (persistentvolumeclaim,namespace) (kubelet_volume_stats_capacity_bytes/1024/1024/1024) * 0.089))",
Expand Down Expand Up @@ -817,6 +846,10 @@
"type": "row"
},
{
"datasource": {
"type": "prometheus",
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
"color": {
Expand Down Expand Up @@ -886,7 +919,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
"uid": "${datasource}"
},
"exemplar": false,
"expr": "topk(6,\n sum_over_time(\n sum by (namespace) (\n # See description for label_replace\n label_replace(\n zone_capacity_instance_namespace_node_pod:pod_cpu_usage_instance_cpu_price:spot_pod_cpu_usage_cost\n OR\n capacity_instance_namespace_node_pod:pod_cpu_usage_instance_cpu_price:on_demand_pod_cpu_usage_cost\n , \"resource\", \"CPU\", \"\",\"\")\n \n OR \n \n label_replace(\n zone_capacity_instance_namespace_node_pod:pod_memory_usage_instance_mem_price:spot_pod_mem_usage_cost\n OR\n capacity_instance_namespace_node_pod:pod_memory_usage_instance_mem_price:on_demand_pod_mem_usage_cost\n , \"resource\", \"memory\", \"\",\"\")\n\n )\n [1d:1h])\n)",
Expand Down Expand Up @@ -931,6 +964,10 @@
"type": "barchart"
},
{
"datasource": {
"type": "prometheus",
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
"color": {
Expand Down Expand Up @@ -1000,7 +1037,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
"uid": "${datasource}"
},
"exemplar": false,
"expr": "topk(6,\n sum_over_time(\n sum by (namespace) (\n zone_capacity_instance_namespace_node_pod:pod_cpu_usage_instance_cpu_price:spot_pod_cpu_usage_cost\n OR\n capacity_instance_namespace_node_pod:pod_cpu_usage_instance_cpu_price:on_demand_pod_cpu_usage_cost\n )\n [1d:1h])\n)",
Expand Down Expand Up @@ -1045,6 +1082,10 @@
"type": "barchart"
},
{
"datasource": {
"type": "prometheus",
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
"color": {
Expand Down Expand Up @@ -1114,7 +1155,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
"uid": "${datasource}"
},
"exemplar": false,
"expr": "topk(6,\n sum_over_time(\n sum by (namespace) (\n zone_capacity_instance_namespace_node_pod:pod_memory_usage_instance_mem_price:spot_pod_mem_usage_cost\n OR\n capacity_instance_namespace_node_pod:pod_memory_usage_instance_mem_price:on_demand_pod_mem_usage_cost\n )\n [1d:1h])\n)",
Expand Down Expand Up @@ -1159,6 +1200,10 @@
"type": "barchart"
},
{
"datasource": {
"type": "prometheus",
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
"color": {
Expand Down Expand Up @@ -1229,7 +1274,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
"uid": "${datasource}"
},
"exemplar": false,
"expr": "topk(10,\n sum_over_time(\n sum by (pod) (\n # See description for label_replace\n label_replace(\n zone_capacity_instance_namespace_node_pod:pod_cpu_usage_instance_cpu_price:spot_pod_cpu_usage_cost\n OR\n capacity_instance_namespace_node_pod:pod_cpu_usage_instance_cpu_price:on_demand_pod_cpu_usage_cost\n , \"resource\", \"CPU\", \"\",\"\")\n \n OR \n \n label_replace(\n zone_capacity_instance_namespace_node_pod:pod_memory_usage_instance_mem_price:spot_pod_mem_usage_cost\n OR\n capacity_instance_namespace_node_pod:pod_memory_usage_instance_mem_price:on_demand_pod_mem_usage_cost\n , \"resource\", \"memory\", \"\",\"\")\n\n )\n [1d:1h])\n)",
Expand Down Expand Up @@ -1284,7 +1329,27 @@
"style": "dark",
"tags": [],
"templating": {
"list": []
"list": [
{
"current": {
"selected": true,
"text": "Prometheus",
"value": "Prometheus"
},
"hide": 0,
"includeAll": false,
"label": "datasource",
"multi": false,
"name": "datasource",
"options": [],
"query": "prometheus",
"queryValue": "",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"type": "datasource"
}
]
},
"time": {
"from": "now-24h",
Expand All @@ -1296,6 +1361,6 @@
"timezone": "",
"title": "Exec Kubernetes Cost Report",
"uid": "ldZSL-T7rsafa",
"version": 2,
"version": 1,
"weekStart": ""
}
Loading

0 comments on commit 6043836

Please sign in to comment.