[create-pull-request] automated change (#24)

Co-authored-by: bonddim-actions[bot] <169367001+bonddim-actions[bot]@users.noreply.github.com>
bonddim · Dec 18, 2024 · d33804f · d33804f
1 parent 21ee81d
commit d33804f
Show file tree

Hide file tree

Showing 4 changed files with 317 additions and 8 deletions.
diff --git a/docs/azure/dashboards/k8s-resources-node.json b/docs/azure/dashboards/k8s-resources-node.json
@@ -342,6 +342,109 @@
           "legendFormat": "{{pod}}"
         }
       ],
+      "title": "Memory Usage (w/cache)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "datasource",
+        "uid": "-- Mixed --"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "fillOpacity": 10,
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "mode": "normal"
+            }
+          },
+          "unit": "bytes"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "max capacity"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "red",
+                  "mode": "fixed"
+                }
+              },
+              {
+                "id": "custom.stacking",
+                "value": {
+                  "mode": "none"
+                }
+              },
+              {
+                "id": "custom.hideFrom",
+                "value": {
+                  "legend": false,
+                  "tooltip": true,
+                  "viz": false
+                }
+              },
+              {
+                "id": "custom.lineStyle",
+                "value": {
+                  "dash": [
+                    10,
+                    10
+                  ],
+                  "fill": "dash"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 24,
+        "x": 0,
+        "y": 18
+      },
+      "id": 4,
+      "interval": "1m",
+      "options": {
+        "legend": {
+          "asTable": true,
+          "calcs": [
+            "lastNotNull"
+          ],
+          "displayMode": "table",
+          "placement": "right",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "v11.4.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${datasource}"
+          },
+          "expr": "sum(kube_node_status_capacity{cluster=\"$cluster\", job=\"kube-state-metrics\", node=~\"$node\", resource=\"memory\"})",
+          "legendFormat": "max capacity"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${datasource}"
+          },
+          "expr": "sum(node_namespace_pod_container:container_memory_rss{cluster=\"$cluster\", node=~\"$node\", container!=\"\"}) by (pod)",
+          "legendFormat": "{{pod}}"
+        }
+      ],
       "title": "Memory Usage (w/o cache)",
       "type": "timeseries"
     },
@@ -390,9 +493,9 @@
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 18
+        "y": 24
       },
-      "id": 4,
+      "id": 5,
       "pluginVersion": "v11.4.0",
       "targets": [
         {

diff --git a/docs/default/dashboards/k8s-resources-node.json b/docs/default/dashboards/k8s-resources-node.json
@@ -342,6 +342,109 @@
           "legendFormat": "{{pod}}"
         }
       ],
+      "title": "Memory Usage (w/cache)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "datasource",
+        "uid": "-- Mixed --"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "fillOpacity": 10,
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "mode": "normal"
+            }
+          },
+          "unit": "bytes"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "max capacity"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "red",
+                  "mode": "fixed"
+                }
+              },
+              {
+                "id": "custom.stacking",
+                "value": {
+                  "mode": "none"
+                }
+              },
+              {
+                "id": "custom.hideFrom",
+                "value": {
+                  "legend": false,
+                  "tooltip": true,
+                  "viz": false
+                }
+              },
+              {
+                "id": "custom.lineStyle",
+                "value": {
+                  "dash": [
+                    10,
+                    10
+                  ],
+                  "fill": "dash"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 24,
+        "x": 0,
+        "y": 18
+      },
+      "id": 4,
+      "interval": "1m",
+      "options": {
+        "legend": {
+          "asTable": true,
+          "calcs": [
+            "lastNotNull"
+          ],
+          "displayMode": "table",
+          "placement": "right",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "v11.4.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${datasource}"
+          },
+          "expr": "sum(kube_node_status_capacity{cluster=\"$cluster\", job=\"kube-state-metrics\", node=~\"$node\", resource=\"memory\"})",
+          "legendFormat": "max capacity"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${datasource}"
+          },
+          "expr": "sum(node_namespace_pod_container:container_memory_rss{cluster=\"$cluster\", node=~\"$node\", container!=\"\"}) by (pod)",
+          "legendFormat": "{{pod}}"
+        }
+      ],
       "title": "Memory Usage (w/o cache)",
       "type": "timeseries"
     },
@@ -390,9 +493,9 @@
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 18
+        "y": 24
       },
-      "id": 4,
+      "id": 5,
       "pluginVersion": "v11.4.0",
       "targets": [
         {

diff --git a/docs/multicluster/dashboards/k8s-resources-node.json b/docs/multicluster/dashboards/k8s-resources-node.json
@@ -342,6 +342,109 @@
           "legendFormat": "{{pod}}"
         }
       ],
+      "title": "Memory Usage (w/cache)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "datasource",
+        "uid": "-- Mixed --"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "fillOpacity": 10,
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "mode": "normal"
+            }
+          },
+          "unit": "bytes"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "max capacity"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "red",
+                  "mode": "fixed"
+                }
+              },
+              {
+                "id": "custom.stacking",
+                "value": {
+                  "mode": "none"
+                }
+              },
+              {
+                "id": "custom.hideFrom",
+                "value": {
+                  "legend": false,
+                  "tooltip": true,
+                  "viz": false
+                }
+              },
+              {
+                "id": "custom.lineStyle",
+                "value": {
+                  "dash": [
+                    10,
+                    10
+                  ],
+                  "fill": "dash"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 24,
+        "x": 0,
+        "y": 18
+      },
+      "id": 4,
+      "interval": "1m",
+      "options": {
+        "legend": {
+          "asTable": true,
+          "calcs": [
+            "lastNotNull"
+          ],
+          "displayMode": "table",
+          "placement": "right",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "v11.4.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${datasource}"
+          },
+          "expr": "sum(kube_node_status_capacity{cluster=\"$cluster\", job=\"kube-state-metrics\", node=~\"$node\", resource=\"memory\"})",
+          "legendFormat": "max capacity"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${datasource}"
+          },
+          "expr": "sum(node_namespace_pod_container:container_memory_rss{cluster=\"$cluster\", node=~\"$node\", container!=\"\"}) by (pod)",
+          "legendFormat": "{{pod}}"
+        }
+      ],
       "title": "Memory Usage (w/o cache)",
       "type": "timeseries"
     },
@@ -390,9 +493,9 @@
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 18
+        "y": 24
       },
-      "id": 4,
+      "id": 5,
       "pluginVersion": "v11.4.0",
       "targets": [
         {

diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
@@ -48,8 +48,8 @@
           "subdir": ""
         }
       },
-      "version": "b726a916acea56dda0d4e1f77548d6a612444165",
-      "sum": "+MVf+ueTBd0DWAQHC+c+vzMB2eWtgBmDA9PSL+/f4FQ="
+      "version": "13a06e4adff639de16a21142a0ec61f09f036eed",
+      "sum": "OECTZ3eNsShSMxFR3GW/s1VTcvzshI5Mes6i4qARfno="
     }
   ],
   "legacyImports": false