grafana updates (#2498) (#2505)

kubecost · Aug 16, 2023 · 9381d5a · 9381d5a
1 parent 9d5da84
commit 9381d5a
Show file tree

Hide file tree

Showing 5 changed files with 348 additions and 388 deletions.
diff --git a/cost-analyzer/Chart.yaml b/cost-analyzer/Chart.yaml
@@ -20,4 +20,4 @@ dependencies:
   - condition: global.thanos.enabled
     name: thanos
     repository: file://./charts/thanos
-    version: "~0.29.0"
+    version: "~0.29.0"
diff --git a/cost-analyzer/charts/grafana/templates/configmap.yaml b/cost-analyzer/charts/grafana/templates/configmap.yaml
@@ -65,7 +65,6 @@ data:
         prometheusVersion: 2.35.0
         timeInterval: 1m
 {{- end -}}
-# end of if not .Values.datasources:
 {{- end }}
 {{- if .Values.dashboardProviders }}
   {{- range $key, $value := .Values.dashboardProviders }}

diff --git a/cost-analyzer/networkCosts-metrics.json b/cost-analyzer/networkCosts-metrics.json
@@ -25,7 +25,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 12,
+  "id": 24,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -58,8 +58,8 @@
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
+            "drawStyle": "bars",
+            "fillOpacity": 100,
             "gradientMode": "none",
             "hideFrom": {
               "legend": false,
@@ -82,7 +82,6 @@
               "mode": "off"
             }
           },
-          "decimals": 2,
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -97,7 +96,7 @@
               }
             ]
           },
-          "unit": "decmbytes"
+          "unit": "bytes"
         },
         "overrides": []
       },
@@ -127,8 +126,8 @@
             "uid": "${datasource}"
           },
           "editorMode": "code",
-          "expr": "sum by($aggregation) (increase(kubecost_pod_network_ingress_bytes_total{namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\"}[60m])) / 1024 / 1024",
-          "interval": "",
+          "expr": "sum(increase(kubecost_pod_network_ingress_bytes_total\n {namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\"}\n [1h]\n ))\nby($aggregation) ",
+          "interval": "1h",
           "legendFormat": "__auto",
           "range": true,
           "refId": "A"
@@ -139,8 +138,9 @@
             "uid": "${datasource}"
           },
           "editorMode": "code",
-          "expr": "- sum by($aggregation) (increase(kubecost_pod_network_egress_bytes_total{namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\"}[60m])) / 1024 / 1024",
+          "expr": "-sum(increase(kubecost_pod_network_egress_bytes_total\n {namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\"}\n [1h]\n ))\nby($aggregation) ",
           "hide": false,
+          "interval": "1h",
           "legendFormat": "__auto",
           "range": true,
           "refId": "B"
@@ -165,8 +165,8 @@
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
+            "drawStyle": "bars",
+            "fillOpacity": 100,
             "gradientMode": "none",
             "hideFrom": {
               "legend": false,
@@ -203,7 +203,7 @@
               }
             ]
           },
-          "unit": "decmbytes"
+          "unit": "bytes"
         },
         "overrides": []
       },
@@ -233,9 +233,9 @@
             "uid": "${datasource}"
           },
           "editorMode": "code",
-          "expr": "sum by($aggregation) (increase(kubecost_pod_network_ingress_bytes_total{internet=\"true\", namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\"}[60m])) / 1024 / 1024",
+          "expr": "sum(increase(kubecost_pod_network_ingress_bytes_total\n  {internet=\"true\", namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\"}\n  [1h]\n))\nby($aggregation) ",
           "hide": false,
-          "interval": "",
+          "interval": "1h",
           "legendFormat": "__auto",
           "range": true,
           "refId": "A"
@@ -246,8 +246,9 @@
             "uid": "${datasource}"
           },
           "editorMode": "code",
-          "expr": "- sum by($aggregation) (increase(kubecost_pod_network_egress_bytes_total{internet=\"true\", namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\"}[60m])) / 1024 / 1024",
+          "expr": "- sum(increase(kubecost_pod_network_egress_bytes_total\n    {internet=\"true\", namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\"}\n    [1h]))\nby($aggregation) ",
           "hide": false,
+          "interval": "1h",
           "legendFormat": "__auto",
           "range": true,
           "refId": "B"
@@ -273,8 +274,8 @@
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
+            "drawStyle": "bars",
+            "fillOpacity": 100,
             "gradientMode": "none",
             "hideFrom": {
               "legend": false,
@@ -312,7 +313,7 @@
               }
             ]
           },
-          "unit": "decmbytes"
+          "unit": "bytes"
         },
         "overrides": []
       },
@@ -342,8 +343,8 @@
             "uid": "${datasource}"
           },
           "editorMode": "code",
-          "expr": "sum by($aggregation) (increase(kubecost_pod_network_ingress_bytes_total{internet=\"false\", namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\", sameRegion=\"false\", sameZone=\"false\"}[60m])) / 1024 / 1024",
-          "interval": "",
+          "expr": "sum(increase(kubecost_pod_network_ingress_bytes_total\n    {internet=\"false\",namespace=~\"$namespace\",cluster_id=~\"$cluster\",pod_name=~\"$pod\", sameRegion=\"false\",sameZone=\"false\"}\n    [1h]))\nby($aggregation)",
+          "interval": "1h",
           "legendFormat": "__auto",
           "range": true,
           "refId": "A"
@@ -354,8 +355,9 @@
             "uid": "${datasource}"
           },
           "editorMode": "code",
-          "expr": "- sum by($aggregation) (increase(kubecost_pod_network_egress_bytes_total{internet=\"false\", namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\", sameRegion=\"false\", sameZone=\"false\"}[60m])) / 1024 / 1024",
+          "expr": "- sum(increase(kubecost_pod_network_egress_bytes_total\n    {internet=\"false\", namespace=~\"$namespace\",cluster_id=~\"$cluster\",pod_name=~\"$pod\",sameRegion=\"false\", sameZone=\"false\"}\n    [1h]))\nby($aggregation) ",
           "hide": false,
+          "interval": "1h",
           "legendFormat": "__auto",
           "range": true,
           "refId": "B"
@@ -381,8 +383,8 @@
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
+            "drawStyle": "bars",
+            "fillOpacity": 100,
             "gradientMode": "none",
             "hideFrom": {
               "legend": false,
@@ -420,7 +422,7 @@
               }
             ]
           },
-          "unit": "decmbytes"
+          "unit": "bytes"
         },
         "overrides": []
       },
@@ -450,8 +452,8 @@
             "uid": "${datasource}"
           },
           "editorMode": "code",
-          "expr": "sum by($aggregation) (increase(kubecost_pod_network_ingress_bytes_total{internet=\"false\", namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\", sameRegion=\"true\", sameZone=\"false\"}[60m])) / 1024 / 1024",
-          "interval": "",
+          "expr": "sum(increase(kubecost_pod_network_ingress_bytes_total\n  {internet=\"false\", namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\", sameRegion=\"true\", sameZone=\"false\"}\n  [1h]))\nby($aggregation)",
+          "interval": "1h",
           "legendFormat": "__auto",
           "range": true,
           "refId": "A"
@@ -462,8 +464,9 @@
             "uid": "${datasource}"
           },
           "editorMode": "code",
-          "expr": "- sum by($aggregation) (increase(kubecost_pod_network_egress_bytes_total{internet=\"false\", namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\", sameRegion=\"true\", sameZone=\"false\"}[60m])) / 1024 / 1024",
+          "expr": "- sum(increase(kubecost_pod_network_egress_bytes_total\n  {internet=\"false\", namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\", sameRegion=\"true\", sameZone=\"false\"}\n  [1h]))\nby($aggregation)",
           "hide": false,
+          "interval": "1h",
           "legendFormat": "__auto",
           "range": true,
           "refId": "B"
@@ -473,19 +476,18 @@
       "type": "timeseries"
     }
   ],
-  "refresh": false,
-  "schemaVersion": 37,
+  "refresh": "",
+  "revision": 1,
+  "schemaVersion": 38,
   "style": "dark",
   "tags": [
-		"utilization",
-		"metrics",
     "kubecost"
   ],
   "templating": {
     "list": [
       {
         "current": {
-          "selected": false,
+          "selected": true,
           "text": "Prometheus",
           "value": "Prometheus"
         },
@@ -504,8 +506,8 @@
       {
         "current": {
           "selected": true,
-          "text": "namespace",
-          "value": "namespace"
+          "text": "pod",
+          "value": "pod"
         },
         "hide": 0,
         "includeAll": false,
@@ -518,17 +520,17 @@
             "value": "cluster_id"
           },
           {
-            "selected": true,
+            "selected": false,
             "text": "namespace",
             "value": "namespace"
           },
           {
-            "selected": false,
-            "text": "pod_name",
-            "value": "pod_name"
+            "selected": true,
+            "text": "pod",
+            "value": "pod"
           }
         ],
-        "query": "cluster_id, namespace, pod_name",
+        "query": "cluster_id, namespace, pod",
         "queryValue": "",
         "skipUrlSync": false,
         "type": "custom"
@@ -562,8 +564,8 @@
       {
         "current": {
           "selected": false,
-          "text": "All",
-          "value": "$__all"
+          "text": "kubecost",
+          "value": "kubecost"
         },
         "datasource": {
           "type": "prometheus",
@@ -632,6 +634,6 @@
   "timezone": "",
   "title": "Kubecost networkCosts Metrics",
   "uid": "kubecost-networkCosts-metrics",
-  "version": 7,
+  "version": 8,
   "weekStart": ""
 }