diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 88a61ac8e7ae43bdb88ac5f2a2ac8b56120ad98a..1150a138358cf0dede545357439855e3e6be917b 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
}
},
- "version": "94b30526f43d589912a38193b69dce19b4fa1893"
+ "version": "a4cd74c5906273ea2c38a2b728641cdef017c76c"
},
{
"name": "ksonnet",
@@ -28,7 +28,7 @@
"subdir": ""
}
},
- "version": "5525c8cc8a4a52d272bdaf481dd77b53a0c0f051"
+ "version": "ccb787a44f2ebdecbb346d57490fa7e49981b323"
},
{
"name": "grafonnet",
@@ -48,7 +48,7 @@
"subdir": "grafana-builder"
}
},
- "version": "403b7d0120d2903d21854eae217b4e4863c454d1"
+ "version": "bbf03a7971ebac7011ef9320fcc23cc01e0a54d3"
},
{
"name": "grafana",
@@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin"
}
},
- "version": "4cd0bf8ea846a0d158761d55899f631eb2a423cf"
+ "version": "8c228d692bfa516e1c0977922f061b9a0fb1ae0f"
}
]
}
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index c4ff59b08abda47a658e0e7d1efaa711e7bc6357..d8bf4633a74b67ff5efd58974cd2e6720cc1fe86 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -2831,7 +2831,7 @@ items:
},
"yaxes": [
{
- "format": "decbytes",
+ "format": "bytes",
"label": null,
"logBase": 1,
"max": null,
@@ -2919,7 +2919,7 @@ items:
],
"type": "number",
- "unit": "decbytes"
+ "unit": "bytes"
},
{
"alias": "Memory Requests",
@@ -2937,7 +2937,7 @@ items:
],
"type": "number",
- "unit": "decbytes"
+ "unit": "bytes"
},
{
"alias": "Memory Requests %",
@@ -2973,7 +2973,7 @@ items:
],
"type": "number",
- "unit": "decbytes"
+ "unit": "bytes"
},
{
"alias": "Memory Limits %",
@@ -3625,7 +3625,7 @@ items:
],
"timeFrom": null,
"timeShift": null,
- "title": "Memory Usage",
+ "title": "Memory Usage (w/o cache)",
"tooltip": {
"shared": true,
"sort": 0,
@@ -3643,7 +3643,7 @@ items:
},
"yaxes": [
{
- "format": "decbytes",
+ "format": "bytes",
"label": null,
"logBase": 1,
"max": null,
@@ -3731,7 +3731,7 @@ items:
],
"type": "number",
- "unit": "decbytes"
+ "unit": "bytes"
},
{
"alias": "Memory Requests",
@@ -3749,7 +3749,7 @@ items:
],
"type": "number",
- "unit": "decbytes"
+ "unit": "bytes"
},
{
"alias": "Memory Requests %",
@@ -3785,7 +3785,7 @@ items:
],
"type": "number",
- "unit": "decbytes"
+ "unit": "bytes"
},
{
"alias": "Memory Limits %",
@@ -3805,6 +3805,60 @@ items:
"type": "number",
"unit": "percentunit"
},
+ {
+ "alias": "Memory Usage (RSS)",
+ "colorMode": null,
+ "colors": [
+
+ ],
+ "dateFormat": "YYYY-MM-DD HH:mm:ss",
+ "decimals": 2,
+ "link": false,
+ "linkTooltip": "Drill down",
+ "linkUrl": "",
+ "pattern": "Value #F",
+ "thresholds": [
+
+ ],
+ "type": "number",
+ "unit": "bytes"
+ },
+ {
+ "alias": "Memory Usage (Cache)",
+ "colorMode": null,
+ "colors": [
+
+ ],
+ "dateFormat": "YYYY-MM-DD HH:mm:ss",
+ "decimals": 2,
+ "link": false,
+ "linkTooltip": "Drill down",
+ "linkUrl": "",
+ "pattern": "Value #G",
+ "thresholds": [
+
+ ],
+ "type": "number",
+ "unit": "bytes"
+ },
+ {
+ "alias": "Memory Usage (Swap",
+ "colorMode": null,
+ "colors": [
+
+ ],
+ "dateFormat": "YYYY-MM-DD HH:mm:ss",
+ "decimals": 2,
+ "link": false,
+ "linkTooltip": "Drill down",
+ "linkUrl": "",
+ "pattern": "Value #H",
+ "thresholds": [
+
+ ],
+ "type": "number",
+ "unit": "bytes"
+ },
{
"alias": "Pod",
"colorMode": null,
@@ -3884,6 +3938,33 @@ items:
"legendFormat": "",
"refId": "E",
"step": 10
+ },
+ {
+ "expr": "sum(label_replace(container_memory_rss{namespace=\"$namespace\",container_name!=\"\"}, \"pod\", \"$1\", \"pod_name\", \"(.*)\")) by (pod)",
+ "format": "table",
+ "instant": true,
+ "intervalFactor": 2,
+ "legendFormat": "",
+ "refId": "F",
+ "step": 10
+ },
+ {
+ "expr": "sum(label_replace(container_memory_cache{namespace=\"$namespace\",container_name!=\"\"}, \"pod\", \"$1\", \"pod_name\", \"(.*)\")) by (pod)",
+ "format": "table",
+ "instant": true,
+ "intervalFactor": 2,
+ "legendFormat": "",
+ "refId": "G",
+ "step": 10
+ },
+ {
+ "expr": "sum(label_replace(container_memory_swap{namespace=\"$namespace\",container_name!=\"\"}, \"pod\", \"$1\", \"pod_name\", \"(.*)\")) by (pod)",
+ "format": "table",
+ "instant": true,
+ "intervalFactor": 2,
+ "legendFormat": "",
+ "refId": "H",
+ "step": 10
}
],
"thresholds": [
@@ -4451,10 +4532,26 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "sum(container_memory_usage_bytes{namespace=\"$namespace\", pod_name=\"$pod\", container_name!=\"POD\", container_name!=\"\"}) by (container_name)",
+ "expr": "sum(container_memory_rss{namespace=\"$namespace\", pod_name=\"$pod\", container_name!=\"POD\", container_name!=\"\"}) by (container_name)",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "{{container_name}}",
+ "legendFormat": "{{container_name}} (RSS)",
+ "legendLink": null,
+ "step": 10
+ },
+ {
+ "expr": "sum(container_memory_cache{namespace=\"$namespace\", pod_name=\"$pod\", container_name!=\"POD\", container_name!=\"\"}) by (container_name)",
+ "format": "time_series",
+ "intervalFactor": 2,
+ "legendFormat": "{{container_name}} (Cache)",
+ "legendLink": null,
+ "step": 10
+ },
+ {
+ "expr": "sum(container_memory_swap{namespace=\"$namespace\", pod_name=\"$pod\", container_name!=\"POD\", container_name!=\"\"}) by (container_name)",
+ "format": "time_series",
+ "intervalFactor": 2,
+ "legendFormat": "{{container_name}} (Swap)",
"legendLink": null,
"step": 10
}
@@ -4482,7 +4579,7 @@ items:
},
"yaxes": [
{
- "format": "short",
+ "format": "bytes",
"label": null,
"logBase": 1,
"max": null,
@@ -4570,7 +4667,7 @@ items:
],
"type": "number",
- "unit": "decbytes"
+ "unit": "bytes"
},
{
"alias": "Memory Requests",
@@ -4588,7 +4685,7 @@ items:
],
"type": "number",
- "unit": "decbytes"
+ "unit": "bytes"
},
{
"alias": "Memory Requests %",
@@ -4624,7 +4721,7 @@ items:
],
"type": "number",
- "unit": "decbytes"
+ "unit": "bytes"
},
{
"alias": "Memory Limits %",
@@ -4644,6 +4741,60 @@ items:
"type": "number",
"unit": "percentunit"
},
+ {
+ "alias": "Memory Usage (RSS)",
+ "colorMode": null,
+ "colors": [
+
+ ],
+ "dateFormat": "YYYY-MM-DD HH:mm:ss",
+ "decimals": 2,
+ "link": false,
+ "linkTooltip": "Drill down",
+ "linkUrl": "",
+ "pattern": "Value #F",
+ "thresholds": [
+
+ ],
+ "type": "number",
+ "unit": "bytes"
+ },
+ {
+ "alias": "Memory Usage (Cache)",
+ "colorMode": null,
+ "colors": [
+
+ ],
+ "dateFormat": "YYYY-MM-DD HH:mm:ss",
+ "decimals": 2,
+ "link": false,
+ "linkTooltip": "Drill down",
+ "linkUrl": "",
+ "pattern": "Value #G",
+ "thresholds": [
+
+ ],
+ "type": "number",
+ "unit": "bytes"
+ },
+ {
+ "alias": "Memory Usage (Swap",
+ "colorMode": null,
+ "colors": [
+
+ ],
+ "dateFormat": "YYYY-MM-DD HH:mm:ss",
+ "decimals": 2,
+ "link": false,
+ "linkTooltip": "Drill down",
+ "linkUrl": "",
+ "pattern": "Value #H",
+ "thresholds": [
+
+ ],
+ "type": "number",
+ "unit": "bytes"
+ },
{
"alias": "Container",
"colorMode": null,
@@ -4723,6 +4874,33 @@ items:
"legendFormat": "",
"refId": "E",
"step": 10
+ },
+ {
+ "expr": "sum(label_replace(container_memory_rss{namespace=\"$namespace\", pod_name=\"$pod\", container_name != \"\", container_name != \"POD\"}, \"container\", \"$1\", \"container_name\", \"(.*)\")) by (container)",
+ "format": "table",
+ "instant": true,
+ "intervalFactor": 2,
+ "legendFormat": "",
+ "refId": "F",
+ "step": 10
+ },
+ {
+ "expr": "sum(label_replace(container_memory_cache{namespace=\"$namespace\", pod_name=\"$pod\", container_name != \"\", container_name != \"POD\"}, \"container\", \"$1\", \"container_name\", \"(.*)\")) by (container)",
+ "format": "table",
+ "instant": true,
+ "intervalFactor": 2,
+ "legendFormat": "",
+ "refId": "G",
+ "step": 10
+ },
+ {
+ "expr": "sum(label_replace(container_memory_swap{namespace=\"$namespace\", pod_name=\"$pod\", container_name != \"\", container_name != \"POD\"}, \"container\", \"$1\", \"container_name\", \"(.*)\")) by (container)",
+ "format": "table",
+ "instant": true,
+ "intervalFactor": 2,
+ "legendFormat": "",
+ "refId": "H",
+ "step": 10
}
],
"thresholds": [
diff --git a/manifests/prometheus-adapter-apiService.yaml b/manifests/prometheus-adapter-apiService.yaml
index 95d5c32dbedb5b39c1aad09d0493f7516de6acda..a215efe4554c583ec42ec99df08c4b581972c23b 100644
--- a/manifests/prometheus-adapter-apiService.yaml
+++ b/manifests/prometheus-adapter-apiService.yaml
@@ -1,4 +1,4 @@
-apiVersion: apiregistration.k8s.io/v1beta1
+apiVersion: apiregistration.k8s.io/v1
kind: APIService
metadata:
name: v1beta1.metrics.k8s.io
diff --git a/manifests/prometheus-adapter-clusterRoleBinding.yaml b/manifests/prometheus-adapter-clusterRoleBinding.yaml
index 29fa917642efd7515d30a9428d3ea0eb821cb65d..7e8f3da92b6b7b48ee08481d0a77b850c633c514 100644
--- a/manifests/prometheus-adapter-clusterRoleBinding.yaml
+++ b/manifests/prometheus-adapter-clusterRoleBinding.yaml
@@ -2,7 +2,6 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: prometheus-adapter
- namespace: monitoring
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole