diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index f14b6f04..9e0a2701 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "4807b85fe843860b4bb2323a91d4bef15844e8b8", + "version": "1b2ed5a02d4dfc945d491c9694cd2246a751641f", "sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po=" }, { @@ -89,8 +89,8 @@ "subdir": "grafana-builder" } }, - "version": "9dbb57c65d2c0ad301695224687e6207dd631123", - "sum": "G7B6E5sqWirDbMWRhifbLRfGgRFbIh9WCYa6X3kMh6g=" + "version": "54a1543d797d49814d2f9c05b9c222b9f1e4f6e7", + "sum": "dr3ok/KQ0aNc/U+CxO5hlHFuP66z1IlsnthKeE+m/ss=" }, { "source": { @@ -99,7 +99,7 @@ "subdir": "mixin-utils" } }, - "version": "9dbb57c65d2c0ad301695224687e6207dd631123", + "version": "54a1543d797d49814d2f9c05b9c222b9f1e4f6e7", "sum": "VAik6Sh5MD5H1Km1gSIXG4rwQ4m4zyw7odP5TKu3bGo=" }, { @@ -129,8 +129,8 @@ "subdir": "" } }, - "version": "7f553ecc1b3b7a54a4cf7cf526bf1997fa8e403f", - "sum": "HkP6MvgWbbIL74WChYhyNt6CQuTh0tExQWs7nHjLgZI=" + "version": "4a030d9faa1ceea49afa837902cb16aa9bdf1c85", + "sum": "vAaF5nrpqQVSYFa7XoSQ+ZaDMSeLVg6+u8wOEb54ZGA=" }, { "source": { @@ -139,7 +139,7 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "7231f601ba1161a4e9c42a879a17547bafbdf200", + "version": "5b7a11eed724511405a0148026ee96ac426f3787", "sum": "3bioG7CfTfY9zeu5xU4yon6Zt3kYvNkyl492nOhQxnM=" }, { @@ -149,7 +149,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "7231f601ba1161a4e9c42a879a17547bafbdf200", + "version": "5b7a11eed724511405a0148026ee96ac426f3787", "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c=" }, { @@ -159,8 +159,8 @@ "subdir": "jsonnet/kube-prometheus" } }, - "version": "3ceecb148a2e0704f5ca3e17a7185cd4d6afccbf", - "sum": "wLuMCUAVrOnMC9OtlH2SutI2OETqG7eof+ISJPQeR1Y=" + "version": "e5eec3068651b6b5b3a05821b7aa03a0811ef31f", + "sum": "AgWlMKoyyX4Ae3wamnlduFfXLJlCTxSscsVZbCCV0PM=" }, { "source": { @@ -169,7 +169,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "0392446ec82e1e895a762829a7c3d440d1577ac4", + "version": "e8d4389fb105142325399326eb2726373eabe348", "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=", "name": "prometheus-operator-mixin" }, @@ -180,7 +180,7 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "0392446ec82e1e895a762829a7c3d440d1577ac4", + "version": "e8d4389fb105142325399326eb2726373eabe348", "sum": "TcntNOk/HVAJwhK0h23rMgIgxC+5pJFhV4zDBy0IMVI=" }, { @@ -190,7 +190,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "f2fbb318cfa1beb8fcab075aad7ab1a06fe60a6b", + "version": "2a00f0a5dc5497684c340f3b07746a67be97372b", "sum": "j5prvRrJdoCv7n45l5Uy2ghl1IDb9BBUqjwCDs4ZJoQ=", "name": "alertmanager" }, @@ -211,7 +211,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "817dde743c280f3364c5ecb127cf38a26298198c", + "version": "0093e2159e47568b9ce00df5d0041cfa4e70b35b", "sum": "UuADJwhNploRwfJYGb0sr2mi+MvswKpumoOMXnGs0Dc=", "name": "prometheus" }, @@ -222,8 +222,8 @@ "subdir": "jsonnet/controller-gen" } }, - "version": "83a6a00737feb9fad630a71e4a7fcb1b3af2896e", - "sum": "O3c9Uurei8MWAY0Ad7DOL1fMqSgdHyHB7MpHsxSITKM=", + "version": "6ce0fe83f9b0541ace80d80ce39bc6577c245fbc", + "sum": "xUGxDjMr7V/SpY21Xsr0X3ve/a04du3pRlbrA3I/Uk8=", "name": "pyrra" }, { @@ -233,7 +233,7 @@ "subdir": "mixin" } }, - "version": "bda9f2ba03e9c894f3853af0a9555282479331e4", + "version": "80d53a8205db4bb40021e5dd279eab8fc54e01b4", "sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=", "name": "thanos-mixin" }, diff --git a/monitoring-satellite/manifests/crds/pyrra-crd.yaml b/monitoring-satellite/manifests/crds/pyrra-crd.yaml index 241b0c3a..93503d2c 100644 --- a/monitoring-satellite/manifests/crds/pyrra-crd.yaml +++ b/monitoring-satellite/manifests/crds/pyrra-crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.18.0 name: servicelevelobjectives.pyrra.dev spec: group: pyrra.dev diff --git a/monitoring-satellite/manifests/grafana/dashboardDefinitions.yaml b/monitoring-satellite/manifests/grafana/dashboardDefinitions.yaml index 7a1bf729..b5f503fb 100644 --- a/monitoring-satellite/manifests/grafana/dashboardDefinitions.yaml +++ b/monitoring-satellite/manifests/grafana/dashboardDefinitions.yaml @@ -38042,7 +38042,7 @@ items: "custom": { "showPoints": "never" }, - "unit": "binBps" + "unit": "bps" } }, "gridPos": { @@ -38088,7 +38088,7 @@ items: "custom": { "showPoints": "never" }, - "unit": "binBps" + "unit": "bps" } }, "gridPos": { @@ -38139,7 +38139,7 @@ items: "properties": [ { "id": "unit", - "value": "binBps" + "value": "bps" } ] }, @@ -38324,7 +38324,7 @@ items: "custom": { "showPoints": "never" }, - "unit": "binBps" + "unit": "bps" } }, "gridPos": { @@ -38370,7 +38370,7 @@ items: "custom": { "showPoints": "never" }, - "unit": "binBps" + "unit": "bps" } }, "gridPos": { @@ -38416,7 +38416,7 @@ items: "custom": { "showPoints": "never" }, - "unit": "binBps" + "unit": "bps" } }, "gridPos": { @@ -38462,7 +38462,7 @@ items: "custom": { "showPoints": "never" }, - "unit": "binBps" + "unit": "bps" } }, "gridPos": { @@ -40142,7 +40142,7 @@ items: "properties": [ { "id": "unit", - "value": "Bps" + "value": "bps" } ] }, @@ -40303,7 +40303,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -40354,7 +40354,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -40405,7 +40405,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -40456,7 +40456,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -40828,7 +40828,7 @@ items: "properties": [ { "id": "unit", - "value": "Bps" + "value": "bps" } ] }, @@ -42390,7 +42390,7 @@ items: "properties": [ { "id": "unit", - "value": "Bps" + "value": "bps" } ] }, @@ -42551,7 +42551,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -42602,7 +42602,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -42974,7 +42974,7 @@ items: "properties": [ { "id": "unit", - "value": "Bps" + "value": "bps" } ] }, @@ -44502,7 +44502,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -44553,7 +44553,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -46954,7 +46954,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate5m{cluster=\"$cluster\", namespace=\"$namespace\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", + "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate5m{cluster=\"$cluster\", namespace=\"$namespace\"}\n * on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", "legendFormat": "__auto" } ], @@ -47013,7 +47013,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate5m{cluster=\"$cluster\", namespace=\"$namespace\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", + "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate5m{cluster=\"$cluster\", namespace=\"$namespace\"}\n * on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", "format": "table", "instant": true }, @@ -47022,7 +47022,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n kube_pod_container_resource_requests{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", + "expr": "sum(\n kube_pod_container_resource_requests{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n * on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", "format": "table", "instant": true }, @@ -47031,7 +47031,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate5m{cluster=\"$cluster\", namespace=\"$namespace\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n/sum(\n kube_pod_container_resource_requests{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", + "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate5m{cluster=\"$cluster\", namespace=\"$namespace\"}\n * on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n/sum(\n kube_pod_container_resource_requests{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n * on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", "format": "table", "instant": true }, @@ -47040,7 +47040,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n kube_pod_container_resource_limits{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", + "expr": "sum(\n kube_pod_container_resource_limits{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n * on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", "format": "table", "instant": true }, @@ -47049,7 +47049,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate5m{cluster=\"$cluster\", namespace=\"$namespace\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n/sum(\n kube_pod_container_resource_limits{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", + "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate5m{cluster=\"$cluster\", namespace=\"$namespace\"}\n * on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n/sum(\n kube_pod_container_resource_limits{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n * on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", "format": "table", "instant": true } @@ -47144,7 +47144,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\", image!=\"\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", + "expr": "sum(\n container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\", image!=\"\"}\n * on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", "legendFormat": "__auto" } ], @@ -47206,7 +47206,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\", image!=\"\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", + "expr": "sum(\n container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\", image!=\"\"}\n * on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", "format": "table", "instant": true }, @@ -47215,7 +47215,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n kube_pod_container_resource_requests{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", + "expr": "sum(\n kube_pod_container_resource_requests{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"}\n * on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", "format": "table", "instant": true }, @@ -47224,7 +47224,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\", image!=\"\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n/sum(\n kube_pod_container_resource_requests{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", + "expr": "sum(\n container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\", image!=\"\"}\n * on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n/sum(\n kube_pod_container_resource_requests{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"}\n * on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", "format": "table", "instant": true }, @@ -47233,7 +47233,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n kube_pod_container_resource_limits{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", + "expr": "sum(\n kube_pod_container_resource_limits{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"}\n * on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", "format": "table", "instant": true }, @@ -47242,7 +47242,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\", image!=\"\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n/sum(\n kube_pod_container_resource_limits{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", + "expr": "sum(\n container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\", image!=\"\"}\n * on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n/sum(\n kube_pod_container_resource_limits{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"}\n * on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=~\"$type\"}\n) by (pod)\n", "format": "table", "instant": true } @@ -47308,7 +47308,7 @@ items: "properties": [ { "id": "unit", - "value": "Bps" + "value": "bps" } ] }, @@ -47357,7 +47357,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "(sum(rate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "format": "table", "instant": true }, @@ -47366,7 +47366,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "(sum(rate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "format": "table", "instant": true }, @@ -47375,7 +47375,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_receive_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "(sum(rate(container_network_receive_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "format": "table", "instant": true }, @@ -47384,7 +47384,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_transmit_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "(sum(rate(container_network_transmit_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "format": "table", "instant": true }, @@ -47393,7 +47393,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_receive_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "(sum(rate(container_network_receive_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "format": "table", "instant": true }, @@ -47402,7 +47402,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_transmit_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "(sum(rate(container_network_transmit_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "format": "table", "instant": true } @@ -47469,7 +47469,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -47501,7 +47501,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "(sum(rate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "legendFormat": "__auto" } ], @@ -47520,7 +47520,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -47552,7 +47552,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "(sum(rate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "legendFormat": "__auto" } ], @@ -47571,7 +47571,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -47603,7 +47603,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(avg(rate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "(avg(rate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "legendFormat": "__auto" } ], @@ -47622,7 +47622,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -47654,7 +47654,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(avg(rate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "(avg(rate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "legendFormat": "__auto" } ], @@ -47705,7 +47705,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_receive_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "(sum(rate(container_network_receive_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "legendFormat": "__auto" } ], @@ -47756,7 +47756,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_transmit_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "(sum(rate(container_network_transmit_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "legendFormat": "__auto" } ], @@ -47807,7 +47807,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_receive_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "(sum(rate(container_network_receive_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "legendFormat": "__auto" } ], @@ -47858,7 +47858,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_transmit_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "(sum(rate(container_network_transmit_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "legendFormat": "__auto" } ], @@ -48072,7 +48072,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate5m{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", + "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate5m{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", "legendFormat": "{{workload}} - {{workload_type}}" }, { @@ -48168,7 +48168,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate5m{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", + "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate5m{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", "format": "table", "instant": true }, @@ -48177,7 +48177,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n kube_pod_container_resource_requests{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", + "expr": "sum(\n kube_pod_container_resource_requests{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n* on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", "format": "table", "instant": true }, @@ -48186,7 +48186,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate5m{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n/sum(\n kube_pod_container_resource_requests{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", + "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate5m{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n/sum(\n kube_pod_container_resource_requests{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n* on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", "format": "table", "instant": true }, @@ -48195,7 +48195,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n kube_pod_container_resource_limits{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", + "expr": "sum(\n kube_pod_container_resource_limits{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n* on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", "format": "table", "instant": true }, @@ -48204,7 +48204,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate5m{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n/sum(\n kube_pod_container_resource_limits{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", + "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate5m{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n/sum(\n kube_pod_container_resource_limits{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n* on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", "format": "table", "instant": true } @@ -48367,7 +48367,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n container_memory_working_set_bytes{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\", image!=\"\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", + "expr": "sum(\n container_memory_working_set_bytes{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\", image!=\"\"}\n * on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", "legendFormat": "{{workload}} - {{workload_type}}" }, { @@ -48466,7 +48466,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n container_memory_working_set_bytes{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\", image!=\"\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", + "expr": "sum(\n container_memory_working_set_bytes{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\", image!=\"\"}\n * on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", "format": "table", "instant": true }, @@ -48475,7 +48475,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n kube_pod_container_resource_requests{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", + "expr": "sum(\n kube_pod_container_resource_requests{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"}\n* on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", "format": "table", "instant": true }, @@ -48484,7 +48484,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n container_memory_working_set_bytes{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\", image!=\"\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n/sum(\n kube_pod_container_resource_requests{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", + "expr": "sum(\n container_memory_working_set_bytes{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\", image!=\"\"}\n * on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n/sum(\n kube_pod_container_resource_requests{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"}\n* on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", "format": "table", "instant": true }, @@ -48493,7 +48493,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n kube_pod_container_resource_limits{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", + "expr": "sum(\n kube_pod_container_resource_limits{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"}\n* on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", "format": "table", "instant": true }, @@ -48502,7 +48502,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(\n container_memory_working_set_bytes{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\", image!=\"\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n/sum(\n kube_pod_container_resource_limits{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", + "expr": "sum(\n container_memory_working_set_bytes{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\", image!=\"\"}\n * on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n/sum(\n kube_pod_container_resource_limits{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"}\n* on(cluster, namespace, pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}\n) by (workload, workload_type)\n", "format": "table", "instant": true } @@ -48584,7 +48584,7 @@ items: "properties": [ { "id": "unit", - "value": "Bps" + "value": "bps" } ] }, @@ -48633,7 +48633,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}) by (workload))\n", + "expr": "(sum(rate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}) by (workload))\n", "format": "table", "instant": true }, @@ -48642,7 +48642,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}) by (workload))\n", + "expr": "(sum(rate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}) by (workload))\n", "format": "table", "instant": true }, @@ -48651,7 +48651,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_receive_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}) by (workload))\n", + "expr": "(sum(rate(container_network_receive_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}) by (workload))\n", "format": "table", "instant": true }, @@ -48660,7 +48660,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_transmit_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}) by (workload))\n", + "expr": "(sum(rate(container_network_transmit_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}) by (workload))\n", "format": "table", "instant": true }, @@ -48669,7 +48669,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_receive_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}) by (workload))\n", + "expr": "(sum(rate(container_network_receive_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}) by (workload))\n", "format": "table", "instant": true }, @@ -48678,7 +48678,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_transmit_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}) by (workload))\n", + "expr": "(sum(rate(container_network_transmit_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=~\"$type\"}) by (workload))\n", "format": "table", "instant": true } @@ -48745,7 +48745,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -48777,7 +48777,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n", + "expr": "(sum(rate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n", "legendFormat": "__auto" } ], @@ -48796,7 +48796,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -48828,7 +48828,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n", + "expr": "(sum(rate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n", "legendFormat": "__auto" } ], @@ -48847,7 +48847,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -48879,7 +48879,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(avg(rate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n", + "expr": "(avg(rate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n", "legendFormat": "__auto" } ], @@ -48898,7 +48898,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -48930,7 +48930,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(avg(rate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n", + "expr": "(avg(rate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n", "legendFormat": "__auto" } ], @@ -48981,7 +48981,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_receive_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n", + "expr": "(sum(rate(container_network_receive_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n", "legendFormat": "__auto" } ], @@ -49032,7 +49032,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_transmit_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n", + "expr": "(sum(rate(container_network_transmit_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n", "legendFormat": "__auto" } ], @@ -49083,7 +49083,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_receive_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n", + "expr": "(sum(rate(container_network_receive_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n", "legendFormat": "__auto" } ], @@ -49134,7 +49134,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "(sum(rate(container_network_transmit_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n", + "expr": "(sum(rate(container_network_transmit_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n", "legendFormat": "__auto" } ], @@ -49443,7 +49443,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -49494,7 +49494,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -50109,7 +50109,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -50160,7 +50160,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -51565,7 +51565,7 @@ items: } ] }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -51619,7 +51619,7 @@ items: } ] }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -51659,7 +51659,7 @@ items: "properties": [ { "id": "unit", - "value": "Bps" + "value": "bps" } ] }, @@ -51818,7 +51818,7 @@ items: "custom": { "showPoints": "never" }, - "unit": "binBps" + "unit": "bps" } }, "gridPos": { @@ -51864,7 +51864,7 @@ items: "custom": { "showPoints": "never" }, - "unit": "binBps" + "unit": "bps" } }, "gridPos": { @@ -52187,7 +52187,7 @@ items: "fixedColor": "green", "mode": "fixed" }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -52227,7 +52227,7 @@ items: "fixedColor": "green", "mode": "fixed" }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -52271,7 +52271,7 @@ items: "properties": [ { "id": "unit", - "value": "binBps" + "value": "bps" } ] }, @@ -52320,7 +52320,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort_desc(sum(rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod) kube_pod_info{cluster=\"$cluster\",namespace=\"$namespace\",host_network=\"false\"}\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload, workload_type))\n", + "expr": "sort_desc(\n sum by (workload, workload_type) (\n rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n * on (cluster, namespace, pod) group_left\n kube_pod_info{cluster=\"$cluster\",namespace=\"$namespace\",host_network=\"false\"}\n * on (cluster, namespace, pod) group_left (workload, workload_type)\n namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}\n )\n)\n", "format": "table", "instant": true }, @@ -52329,7 +52329,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort_desc(sum(rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod) kube_pod_info{cluster=\"$cluster\",namespace=\"$namespace\",host_network=\"false\"}\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload, workload_type))\n", + "expr": "sort_desc(\n sum by (workload, workload_type) (\n rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n * on (cluster, namespace, pod) group_left\n kube_pod_info{cluster=\"$cluster\",namespace=\"$namespace\",host_network=\"false\"}\n * on (cluster, namespace, pod) group_left (workload, workload_type)\n namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}\n )\n)\n", "format": "table", "instant": true }, @@ -52338,7 +52338,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort_desc(avg(rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod) kube_pod_info{cluster=\"$cluster\",namespace=\"$namespace\",host_network=\"false\"}\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload, workload_type))\n", + "expr": "sort_desc(\n avg by (workload, workload_type) (\n rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n * on (cluster, namespace, pod) group_left\n kube_pod_info{cluster=\"$cluster\",namespace=\"$namespace\",host_network=\"false\"}\n * on (cluster, namespace, pod) group_left (workload, workload_type)\n namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}\n )\n)\n", "format": "table", "instant": true }, @@ -52347,7 +52347,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort_desc(avg(rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod) kube_pod_info{cluster=\"$cluster\",namespace=\"$namespace\",host_network=\"false\"}\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload, workload_type))\n", + "expr": "sort_desc(\n avg by (workload, workload_type) (\n rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n * on (cluster, namespace, pod) group_left\n kube_pod_info{cluster=\"$cluster\",namespace=\"$namespace\",host_network=\"false\"}\n * on (cluster, namespace, pod) group_left (workload, workload_type)\n namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}\n )\n)\n", "format": "table", "instant": true }, @@ -52356,7 +52356,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort_desc(sum(rate(container_network_receive_packets_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod) kube_pod_info{cluster=\"$cluster\",namespace=\"$namespace\",host_network=\"false\"}\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload, workload_type))\n", + "expr": "sort_desc(\n sum by (workload, workload_type) (\n rate(container_network_receive_packets_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n * on (cluster, namespace, pod) group_left\n kube_pod_info{cluster=\"$cluster\",namespace=\"$namespace\",host_network=\"false\"}\n * on (cluster, namespace, pod) group_left (workload, workload_type)\n namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}\n )\n)\n", "format": "table", "instant": true }, @@ -52365,7 +52365,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort_desc(sum(rate(container_network_transmit_packets_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod) kube_pod_info{cluster=\"$cluster\",namespace=\"$namespace\",host_network=\"false\"}\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload, workload_type))\n", + "expr": "sort_desc(\n sum by (workload, workload_type) (\n rate(container_network_transmit_packets_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n * on (cluster, namespace, pod) group_left\n kube_pod_info{cluster=\"$cluster\",namespace=\"$namespace\",host_network=\"false\"}\n * on (cluster, namespace, pod) group_left (workload, workload_type)\n namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}\n )\n)\n", "format": "table", "instant": true }, @@ -52374,7 +52374,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort_desc(sum(rate(container_network_receive_packets_dropped_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod) kube_pod_info{cluster=\"$cluster\",namespace=\"$namespace\",host_network=\"false\"}\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload, workload_type))\n", + "expr": "sort_desc(\n sum by (workload, workload_type) (\n rate(container_network_receive_packets_dropped_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n * on (cluster, namespace, pod) group_left\n kube_pod_info{cluster=\"$cluster\",namespace=\"$namespace\",host_network=\"false\"}\n * on (cluster, namespace, pod) group_left (workload, workload_type)\n namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}\n )\n)\n", "format": "table", "instant": true }, @@ -52383,7 +52383,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort_desc(sum(rate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (namespace,pod) kube_pod_info{cluster=\"$cluster\",namespace=\"$namespace\",host_network=\"false\"}\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload, workload_type))\n", + "expr": "sort_desc(\n sum by (workload, workload_type) (\n rate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n * on (cluster, namespace, pod) group_left\n kube_pod_info{cluster=\"$cluster\",namespace=\"$namespace\",host_network=\"false\"}\n * on (cluster, namespace, pod) group_left (workload, workload_type)\n namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}\n )\n)\n", "format": "table", "instant": true } @@ -52474,7 +52474,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -52525,7 +52525,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -52576,7 +52576,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -52627,7 +52627,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -56731,7 +56731,7 @@ items: } ] }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -56785,7 +56785,7 @@ items: } ] }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -56820,7 +56820,7 @@ items: "custom": { "showPoints": "never" }, - "unit": "binBps" + "unit": "bps" } }, "gridPos": { @@ -56866,7 +56866,7 @@ items: "custom": { "showPoints": "never" }, - "unit": "binBps" + "unit": "bps" } }, "gridPos": { @@ -60105,7 +60105,7 @@ items: "fixedColor": "green", "mode": "fixed" }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -60127,7 +60127,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort_desc(sum(rate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=~\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "sort_desc(sum(rate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=~\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "legendFormat": "__auto" } ], @@ -60145,7 +60145,7 @@ items: "fixedColor": "green", "mode": "fixed" }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -60167,7 +60167,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort_desc(sum(rate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=~\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "sort_desc(sum(rate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=~\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "legendFormat": "__auto" } ], @@ -60185,7 +60185,7 @@ items: "fixedColor": "green", "mode": "fixed" }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -60207,7 +60207,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort_desc(avg(rate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=~\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "sort_desc(avg(rate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=~\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "legendFormat": "__auto" } ], @@ -60225,7 +60225,7 @@ items: "fixedColor": "green", "mode": "fixed" }, - "unit": "Bps" + "unit": "bps" } }, "gridPos": { @@ -60247,7 +60247,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort_desc(avg(rate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=~\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "sort_desc(avg(rate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=~\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "legendFormat": "__auto" } ], @@ -60266,7 +60266,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "binBps" + "unit": "bps" } }, "gridPos": { @@ -60298,7 +60298,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort_desc(sum(rate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=~\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "sort_desc(sum(rate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=~\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "legendFormat": "__auto" } ], @@ -60317,7 +60317,7 @@ items: "showPoints": "never", "spanNulls": true }, - "unit": "binBps" + "unit": "bps" } }, "gridPos": { @@ -60349,7 +60349,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort_desc(sum(rate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=~\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "sort_desc(sum(rate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=~\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "legendFormat": "__auto" } ], @@ -60400,7 +60400,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort_desc(sum(rate(container_network_receive_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=~\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "sort_desc(sum(rate(container_network_receive_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=~\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "legendFormat": "__auto" } ], @@ -60451,7 +60451,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort_desc(sum(rate(container_network_transmit_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=~\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "sort_desc(sum(rate(container_network_transmit_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=~\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "legendFormat": "__auto" } ], @@ -60502,7 +60502,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort_desc(sum(rate(container_network_receive_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=~\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "sort_desc(sum(rate(container_network_receive_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=~\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "legendFormat": "__auto" } ], @@ -60553,7 +60553,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort_desc(sum(rate(container_network_transmit_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=~\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", + "expr": "sort_desc(sum(rate(container_network_transmit_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n* on (cluster, namespace, pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=~\"$namespace\", workload=~\"$workload\", workload_type=~\"$type\"}) by (pod))\n", "legendFormat": "__auto" } ], diff --git a/vendor/github.com/grafana/jsonnet-libs/grafana-builder/grafana.libsonnet b/vendor/github.com/grafana/jsonnet-libs/grafana-builder/grafana.libsonnet index be43616c..a1004763 100644 --- a/vendor/github.com/grafana/jsonnet-libs/grafana-builder/grafana.libsonnet +++ b/vendor/github.com/grafana/jsonnet-libs/grafana-builder/grafana.libsonnet @@ -485,7 +485,7 @@ local utils = import 'mixin-utils/utils.libsonnet'; sum by (status) ( label_replace(label_replace(rate(%s[$__rate_interval]), "status", "${1}xx", "%s", "([0-9]).."), - "status", "${1}", "%s", "([a-zA-Z]+)")) + "status", "${1}", "%s", "([a-zA-Z_]+)")) ||| % [selector, statusLabelName, statusLabelName], format: 'time_series', legendFormat: '{{status}}', @@ -503,7 +503,7 @@ local utils = import 'mixin-utils/utils.libsonnet'; sum by (status) ( label_replace(label_replace(%(metricQuery)s, "status", "${1}xx", "%(label)s", "([0-9]).."), - "status", "${1}", "%(label)s", "([a-zA-Z]+)")) + "status", "${1}", "%(label)s", "([a-zA-Z_]+)")) |||, native: template % { metricQuery: nativeClassicQuery.native, label: statusLabelName }, classic: template % { metricQuery: nativeClassicQuery.classic, label: statusLabelName }, diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.github/workflows/ci.yaml b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.github/workflows/ci.yaml index 930a1e6d..cf539222 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.github/workflows/ci.yaml +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.github/workflows/ci.yaml @@ -6,38 +6,67 @@ on: - master pull_request: jobs: + build-tools: + runs-on: ubuntu-latest + name: Build Go Tools + steps: + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + with: + persist-credentials: false + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 + with: + go-version-file: scripts/go.mod + cache-dependency-path: scripts/go.sum + - name: Build Go tools + run: | + mkdir -p tmp/bin + cd scripts && go list -e -mod=mod -tags tools -f '{{ range .Imports }}{{ printf "%s\n" .}}{{end}}' ./ | xargs -tI % go build -mod=mod -o ../tmp/bin % + - name: Upload built tools + uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 + with: + name: go-tools + path: tmp/bin/ + retention-days: 1 + if-no-files-found: error + matrix: runs-on: ubuntu-latest name: ${{ matrix.name }} + needs: build-tools strategy: fail-fast: false matrix: include: - name: Lint Alerts - run: make --always-make alerts-lint + run: make alerts-lint - name: Generate YAML - run: make --always-make generate && git diff --exit-code + run: make generate && git diff --exit-code - name: Lint Grafana Dashboards - run: make --always-make dashboards-lint + run: make dashboards-lint - name: Format JSONNET - run: make --always-make jsonnet-fmt && git diff --exit-code + run: make jsonnet-fmt && git diff --exit-code - name: Lint JSONNET - run: make --always-make jsonnet-lint + run: make jsonnet-lint - name: Format MD - run: make --always-make markdownfmt && git diff --exit-code + run: make markdownfmt && git diff --exit-code - name: Lint MD - run: make --always-make vale && git diff --exit-code + run: make vale && git diff --exit-code - name: Lint YAML - run: make --always-make pint-lint + run: make pint-lint - name: Run unit tests - run: make --always-make test + run: make test steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: persist-credentials: false - - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 + - name: Download built tools + uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0 with: - go-version-file: scripts/go.mod - cache-dependency-path: scripts/go.sum + name: go-tools + path: tmp/bin/ + - name: Make tools executable and update timestamps + run: | + chmod +x tmp/bin/* + touch tmp/bin/* - run: ${{ matrix.run }} diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.github/workflows/release.yaml b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.github/workflows/release.yaml index 19032a9f..7963b14b 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.github/workflows/release.yaml +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.github/workflows/release.yaml @@ -29,7 +29,7 @@ jobs: zip -r kubernetes-mixin-${{ github.ref_name }}.zip dashboards_out prometheus_alerts.yaml prometheus_rules.yaml - name: Upload artifact - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 + uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 with: name: kubernetes-mixin-${{ github.ref_name }}.zip path: ./ @@ -40,7 +40,7 @@ jobs: needs: build steps: - name: Download artifact - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 + uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0 with: name: kubernetes-mixin-${{ github.ref_name }}.zip diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.gitignore b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.gitignore index 9ac562c1..821c8c3e 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.gitignore +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/.gitignore @@ -2,6 +2,5 @@ prometheus_alerts.yaml prometheus_rules.yaml dashboards_out vendor -jsonnetfile.lock.json tmp .vale diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/Makefile b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/Makefile index acf28003..ec383c87 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/Makefile +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/Makefile @@ -20,7 +20,7 @@ OUT_DIR ?=dashboards_out all: fmt generate lint test .PHONY: dev -dev: generate +dev: generate lint @cd scripts && ./lgtm.sh && \ echo '' && \ echo '╔═══════════════════════════════════════════════════════════════╗' && \ @@ -43,9 +43,10 @@ dev-port-forward: kubectl --context kind-kubernetes-mixin wait --for=condition=Ready pods -l app=lgtm --timeout=300s kubectl --context kind-kubernetes-mixin port-forward service/lgtm 3000:3000 4317:4317 4318:4318 9090:9090 -dev-reload: generate +dev-reload: clean-alerts clean-rules generate lint @cp -v prometheus_alerts.yaml scripts/provisioning/prometheus/ && \ cp -v prometheus_rules.yaml scripts/provisioning/prometheus/ && \ + kubectl --context kind-kubernetes-mixin apply -f scripts/lgtm.yaml && \ kubectl --context kind-kubernetes-mixin rollout restart deployment/lgtm && \ echo '╔═══════════════════════════════════════════════════════════════╗' && \ echo '║ ║' && \ @@ -58,8 +59,21 @@ dev-reload: generate dev-down: kind delete cluster --name kubernetes-mixin +clean-alerts: + rm -f prometheus_alerts.yaml + +clean-rules: + rm -f prometheus_rules.yaml + +clean-dashboards: + rm -f $(OUT_DIR)/*.json* + rm -f $(OUT_DIR)/.dashboards-generated + +# Find all libsonnet files recursively in the dashboards directory +DASHBOARD_SOURCES = $(shell find $(SRC_DIR) -name '*.libsonnet' 2>/dev/null) + .PHONY: generate -generate: prometheus_alerts.yaml prometheus_rules.yaml $(OUT_DIR) +generate: prometheus_alerts.yaml prometheus_rules.yaml $(OUT_DIR)/.dashboards-generated $(JSONNET_VENDOR): $(JB_BIN) jsonnetfile.json $(JB_BIN) install @@ -82,9 +96,10 @@ prometheus_alerts.yaml: $(JSONNET_BIN) mixin.libsonnet lib/alerts.jsonnet alerts prometheus_rules.yaml: $(JSONNET_BIN) mixin.libsonnet lib/rules.jsonnet rules/*.libsonnet @$(JSONNET_BIN) -J vendor -S lib/rules.jsonnet > $@ -$(OUT_DIR): $(JSONNET_BIN) $(JSONNET_VENDOR) mixin.libsonnet lib/dashboards.jsonnet $(SRC_DIR)/*.libsonnet +$(OUT_DIR)/.dashboards-generated: $(JSONNET_BIN) $(JSONNET_VENDOR) mixin.libsonnet lib/dashboards.jsonnet $(DASHBOARD_SOURCES) @mkdir -p $(OUT_DIR) @$(JSONNET_BIN) -J vendor -m $(OUT_DIR) lib/dashboards.jsonnet + @touch $@ .PHONY: lint lint: jsonnet-lint alerts-lint dashboards-lint vale pint-lint @@ -99,7 +114,7 @@ alerts-lint: $(PROMTOOL_BIN) prometheus_alerts.yaml prometheus_rules.yaml @$(PROMTOOL_BIN) check rules prometheus_rules.yaml @$(PROMTOOL_BIN) check rules prometheus_alerts.yaml -$(OUT_DIR)/.lint: $(OUT_DIR) +$(OUT_DIR)/.lint: $(OUT_DIR)/.dashboards-generated @cp .lint $@ .PHONY: dashboards-lint diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/resource_alerts.libsonnet b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/resource_alerts.libsonnet index f17f71d4..7b9469db 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/resource_alerts.libsonnet +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/resource_alerts.libsonnet @@ -159,10 +159,16 @@ local utils = import '../lib/utils.libsonnet'; { alert: 'KubeQuotaAlmostFull', expr: ||| - kube_resourcequota{%(prefixedNamespaceSelector)s%(kubeStateMetricsSelector)s, type="used"} - / ignoring(instance, job, type) - (kube_resourcequota{%(prefixedNamespaceSelector)s%(kubeStateMetricsSelector)s, type="hard"} > 0) - > 0.9 < 1 + max without (instance, job, type) ( + kube_resourcequota{%(prefixedNamespaceSelector)s%(kubeStateMetricsSelector)s, type="used"} + ) + / on (%(clusterLabel)s, %(namespaceLabel)s, resource, resourcequota) group_left() + ( + max without (instance, job, type) ( + kube_resourcequota{%(prefixedNamespaceSelector)s%(kubeStateMetricsSelector)s, type="hard"} + ) > 0 + ) + > 0.9 < 1 ||| % $._config, 'for': '15m', labels: { @@ -178,10 +184,16 @@ local utils = import '../lib/utils.libsonnet'; { alert: 'KubeQuotaFullyUsed', expr: ||| - kube_resourcequota{%(prefixedNamespaceSelector)s%(kubeStateMetricsSelector)s, type="used"} - / ignoring(instance, job, type) - (kube_resourcequota{%(prefixedNamespaceSelector)s%(kubeStateMetricsSelector)s, type="hard"} > 0) - == 1 + max without (instance, job, type) ( + kube_resourcequota{%(prefixedNamespaceSelector)s%(kubeStateMetricsSelector)s, type="used"} + ) + / on (%(clusterLabel)s, %(namespaceLabel)s, resource, resourcequota) group_left() + ( + max without (instance, job, type) ( + kube_resourcequota{%(prefixedNamespaceSelector)s%(kubeStateMetricsSelector)s, type="hard"} + ) > 0 + ) + == 1 ||| % $._config, 'for': '15m', labels: { @@ -197,10 +209,15 @@ local utils = import '../lib/utils.libsonnet'; { alert: 'KubeQuotaExceeded', expr: ||| - kube_resourcequota{%(prefixedNamespaceSelector)s%(kubeStateMetricsSelector)s, type="used"} - / ignoring(instance, job, type) - (kube_resourcequota{%(prefixedNamespaceSelector)s%(kubeStateMetricsSelector)s, type="hard"} > 0) - > 1 + max without (instance, job, type) ( + kube_resourcequota{%(prefixedNamespaceSelector)s%(kubeStateMetricsSelector)s, type="used"} + ) + / on (%(clusterLabel)s, %(namespaceLabel)s, resource, resourcequota) group_left() + ( + max without (instance, job, type) ( + kube_resourcequota{%(prefixedNamespaceSelector)s%(kubeStateMetricsSelector)s, type="hard"} + ) > 0 + ) > 1 ||| % $._config, 'for': '15m', labels: { diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/config.libsonnet b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/config.libsonnet index 2fe5de17..a6b2f8be 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/config.libsonnet +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/config.libsonnet @@ -90,6 +90,12 @@ grafanaTimezone: 'UTC', }, + // Units for panels + units: { + // Use 'bps' for bits per second (SI), or 'binBps' for bytes per second (IEC). + network: 'bps', + }, + // Opt-in to multiCluster dashboards by overriding this and the clusterLabel. showMultiCluster: false, clusterLabel: 'cluster', diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/cluster-total.libsonnet b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/cluster-total.libsonnet index 2437c5ba..7e209cef 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/cluster-total.libsonnet +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/cluster-total.libsonnet @@ -63,7 +63,7 @@ local var = g.dashboard.variable; local panels = [ tsPanel.new('Current Rate of Bytes Received') - + tsPanel.standardOptions.withUnit('binBps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', ||| @@ -81,7 +81,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Current Rate of Bytes Transmitted') - + tsPanel.standardOptions.withUnit('binBps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', ||| @@ -267,7 +267,7 @@ local var = g.dashboard.variable; properties: [ { id: 'unit', - value: 'binBps', + value: $._config.units.network, }, ], }, @@ -298,7 +298,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Average Rate of Bytes Received') - + tsPanel.standardOptions.withUnit('binBps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', ||| @@ -316,7 +316,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Average Rate of Bytes Transmitted') - + tsPanel.standardOptions.withUnit('binBps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', ||| @@ -334,7 +334,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Receive Bandwidth') - + tsPanel.standardOptions.withUnit('binBps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', ||| @@ -352,7 +352,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Transmit Bandwidth') - + tsPanel.standardOptions.withUnit('binBps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', ||| diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/namespace-by-pod.libsonnet b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/namespace-by-pod.libsonnet index 61f4ef64..b2c7dadc 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/namespace-by-pod.libsonnet +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/namespace-by-pod.libsonnet @@ -80,24 +80,24 @@ local var = g.dashboard.variable; local panels = [ gauge.new('Current Rate of Bytes Received') + gauge.standardOptions.withDisplayName('$namespace') - + gauge.standardOptions.withUnit('Bps') + + gauge.standardOptions.withUnit($._config.units.network) + gauge.standardOptions.withMin(0) - + gauge.standardOptions.withMax(10000000000) // 10GBs + + gauge.standardOptions.withMax(10000000000) // 10Gbps + gauge.standardOptions.thresholds.withSteps([ { color: 'dark-green', index: 0, - value: null, // 0GBs + value: null, // 0Gbps }, { color: 'dark-yellow', index: 1, - value: 5000000000, // 5GBs + value: 5000000000, // 5Gbps }, { color: 'dark-red', index: 2, - value: 7000000000, // 7GBs + value: 7000000000, // 7Gbps }, ]) + gauge.queryOptions.withInterval($._config.grafanaK8s.minimumTimeInterval) @@ -119,25 +119,25 @@ local var = g.dashboard.variable; gauge.new('Current Rate of Bytes Transmitted') + gauge.standardOptions.withDisplayName('$namespace') - + gauge.standardOptions.withUnit('Bps') + + gauge.standardOptions.withUnit($._config.units.network) + gauge.standardOptions.withMin(0) - + gauge.standardOptions.withMax(10000000000) // 10GBs + + gauge.standardOptions.withMax(10000000000) // 10Gbps + gauge.queryOptions.withInterval($._config.grafanaK8s.minimumTimeInterval) + gauge.standardOptions.thresholds.withSteps([ { color: 'dark-green', index: 0, - value: null, // 0GBs + value: null, // 0Gbps }, { color: 'dark-yellow', index: 1, - value: 5000000000, // 5GBs + value: 5000000000, // 5Gbps }, { color: 'dark-red', index: 2, - value: 7000000000, // 7GBs + value: 7000000000, // 7Gbps }, ]) + gauge.queryOptions.withTargets([ @@ -304,7 +304,7 @@ local var = g.dashboard.variable; properties: [ { id: 'unit', - value: 'Bps', + value: $._config.units.network, }, ], }, @@ -335,7 +335,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Receive Bandwidth') - + tsPanel.standardOptions.withUnit('binBps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', ||| @@ -353,7 +353,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Transmit Bandwidth') - + tsPanel.standardOptions.withUnit('binBps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', ||| diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/namespace-by-workload.libsonnet b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/namespace-by-workload.libsonnet index cbd01916..010c6220 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/namespace-by-workload.libsonnet +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/namespace-by-workload.libsonnet @@ -92,62 +92,35 @@ local var = g.dashboard.variable; }, }; - local colQueries = [ - ||| - sort_desc(sum(rate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster",namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) kube_pod_info{%(clusterLabel)s="$cluster",namespace="$namespace",host_network="false"} - * on (namespace,pod) - group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace="$namespace", workload=~".+", workload_type=~"$type"}) by (workload, workload_type)) - ||| % $._config, - ||| - sort_desc(sum(rate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster",namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) kube_pod_info{%(clusterLabel)s="$cluster",namespace="$namespace",host_network="false"} - * on (namespace,pod) - group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace="$namespace", workload=~".+", workload_type=~"$type"}) by (workload, workload_type)) - ||| % $._config, - ||| - sort_desc(avg(rate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster",namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) kube_pod_info{%(clusterLabel)s="$cluster",namespace="$namespace",host_network="false"} - * on (namespace,pod) - group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace="$namespace", workload=~".+", workload_type=~"$type"}) by (workload, workload_type)) - ||| % $._config, - ||| - sort_desc(avg(rate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster",namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) kube_pod_info{%(clusterLabel)s="$cluster",namespace="$namespace",host_network="false"} - * on (namespace,pod) - group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace="$namespace", workload=~".+", workload_type=~"$type"}) by (workload, workload_type)) - ||| % $._config, - ||| - sort_desc(sum(rate(container_network_receive_packets_total{%(clusterLabel)s="$cluster",namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) kube_pod_info{%(clusterLabel)s="$cluster",namespace="$namespace",host_network="false"} - * on (namespace,pod) - group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace="$namespace", workload=~".+", workload_type=~"$type"}) by (workload, workload_type)) - ||| % $._config, + local columnQuery(aggFunc, metric) = ||| - sort_desc(sum(rate(container_network_transmit_packets_total{%(clusterLabel)s="$cluster",namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) kube_pod_info{%(clusterLabel)s="$cluster",namespace="$namespace",host_network="false"} - * on (namespace,pod) - group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace="$namespace", workload=~".+", workload_type=~"$type"}) by (workload, workload_type)) - ||| % $._config, - ||| - sort_desc(sum(rate(container_network_receive_packets_dropped_total{%(clusterLabel)s="$cluster",namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) kube_pod_info{%(clusterLabel)s="$cluster",namespace="$namespace",host_network="false"} - * on (namespace,pod) - group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace="$namespace", workload=~".+", workload_type=~"$type"}) by (workload, workload_type)) - ||| % $._config, - ||| - sort_desc(sum(rate(container_network_transmit_packets_dropped_total{%(clusterLabel)s="$cluster",namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) kube_pod_info{%(clusterLabel)s="$cluster",namespace="$namespace",host_network="false"} - * on (namespace,pod) - group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace="$namespace", workload=~".+", workload_type=~"$type"}) by (workload, workload_type)) - ||| % $._config, + sort_desc( + %(aggFunc)s by (workload, workload_type) ( + rate(%(metric)s{%%(clusterLabel)s="$cluster",namespace="$namespace"}[%%(grafanaIntervalVar)s]) + * on (%%(clusterLabel)s, namespace, pod) group_left + kube_pod_info{%%(clusterLabel)s="$cluster",namespace="$namespace",host_network="false"} + * on (%%(clusterLabel)s, namespace, pod) group_left (workload, workload_type) + namespace_workload_pod:kube_pod_owner:relabel{%%(clusterLabel)s="$cluster",namespace="$namespace", workload=~".+", workload_type=~"$type"} + ) + ) + ||| % { aggFunc: aggFunc, metric: metric } % $._config; + + local colQueries = [ + columnQuery('sum', 'container_network_receive_bytes_total'), + columnQuery('sum', 'container_network_transmit_bytes_total'), + columnQuery('avg', 'container_network_receive_bytes_total'), + columnQuery('avg', 'container_network_transmit_bytes_total'), + columnQuery('sum', 'container_network_receive_packets_total'), + columnQuery('sum', 'container_network_transmit_packets_total'), + columnQuery('sum', 'container_network_receive_packets_dropped_total'), + columnQuery('sum', 'container_network_transmit_packets_dropped_total'), ]; local panels = [ barGauge.new('Current Rate of Bytes Received') + barGauge.options.withDisplayMode('basic') + barGauge.options.withShowUnfilled(false) - + barGauge.standardOptions.withUnit('Bps') + + barGauge.standardOptions.withUnit($._config.units.network) + barGauge.standardOptions.color.withMode('fixed') + barGauge.standardOptions.color.withFixedColor('green') + barGauge.queryOptions.withInterval($._config.grafanaK8s.minimumTimeInterval) @@ -171,7 +144,7 @@ local var = g.dashboard.variable; barGauge.new('Current Rate of Bytes Transmitted') + barGauge.options.withDisplayMode('basic') + barGauge.options.withShowUnfilled(false) - + barGauge.standardOptions.withUnit('Bps') + + barGauge.standardOptions.withUnit($._config.units.network) + barGauge.standardOptions.color.withMode('fixed') + barGauge.standardOptions.color.withFixedColor('green') + barGauge.queryOptions.withInterval($._config.grafanaK8s.minimumTimeInterval) @@ -298,7 +271,7 @@ local var = g.dashboard.variable; properties: [ { id: 'unit', - value: 'binBps', + value: $._config.units.network, }, ], }, @@ -329,7 +302,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Receive Bandwidth') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', @@ -348,7 +321,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Transmit Bandwidth') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', @@ -367,7 +340,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Average Container Bandwidth by Workload: Received') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', @@ -386,7 +359,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Average Container Bandwidth by Workload: Transmitted') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/pod-total.libsonnet b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/pod-total.libsonnet index e75dcb0d..a6628395 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/pod-total.libsonnet +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/pod-total.libsonnet @@ -81,24 +81,24 @@ local var = g.dashboard.variable; local panels = [ gauge.new('Current Rate of Bytes Received') + gauge.standardOptions.withDisplayName('$pod') - + gauge.standardOptions.withUnit('Bps') + + gauge.standardOptions.withUnit($._config.units.network) + gauge.standardOptions.withMin(0) - + gauge.standardOptions.withMax(10000000000) // 10GBs + + gauge.standardOptions.withMax(10000000000) // 10Gbps + gauge.standardOptions.thresholds.withSteps([ { color: 'dark-green', index: 0, - value: null, // 0GBs + value: null, // 0Gbps }, { color: 'dark-yellow', index: 1, - value: 5000000000, // 5GBs + value: 5000000000, // 5Gbps }, { color: 'dark-red', index: 2, - value: 7000000000, // 7GBs + value: 7000000000, // 7Gbps }, ]) + gauge.queryOptions.withInterval($._config.grafanaK8s.minimumTimeInterval) @@ -112,24 +112,24 @@ local var = g.dashboard.variable; gauge.new('Current Rate of Bytes Transmitted') + gauge.standardOptions.withDisplayName('$pod') - + gauge.standardOptions.withUnit('Bps') + + gauge.standardOptions.withUnit($._config.units.network) + gauge.standardOptions.withMin(0) - + gauge.standardOptions.withMax(10000000000) // 10GBs + + gauge.standardOptions.withMax(10000000000) // 10Gbps + gauge.standardOptions.thresholds.withSteps([ { color: 'dark-green', index: 0, - value: null, // 0GBs + value: null, // 0Gbps }, { color: 'dark-yellow', index: 1, - value: 5000000000, // 5GBs + value: 5000000000, // 5Gbps }, { color: 'dark-red', index: 2, - value: 7000000000, // 7GBs + value: 7000000000, // 7Gbps }, ]) + gauge.queryOptions.withInterval($._config.grafanaK8s.minimumTimeInterval) @@ -142,7 +142,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Receive Bandwidth') - + tsPanel.standardOptions.withUnit('binBps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', @@ -152,7 +152,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Transmit Bandwidth') - + tsPanel.standardOptions.withUnit('binBps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/workload-total.libsonnet b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/workload-total.libsonnet index 81a0e0ae..f1e4d389 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/workload-total.libsonnet +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/workload-total.libsonnet @@ -97,7 +97,7 @@ local var = g.dashboard.variable; barGauge.new('Current Rate of Bytes Received') + barGauge.options.withDisplayMode('basic') + barGauge.options.withShowUnfilled(false) - + barGauge.standardOptions.withUnit('Bps') + + barGauge.standardOptions.withUnit($._config.units.network) + barGauge.standardOptions.color.withMode('fixed') + barGauge.standardOptions.color.withFixedColor('green') + barGauge.queryOptions.withInterval($._config.grafanaK8s.minimumTimeInterval) @@ -106,7 +106,7 @@ local var = g.dashboard.variable; '${datasource}', ||| sort_desc(sum(rate(container_network_receive_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace=~"$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config ) @@ -116,7 +116,7 @@ local var = g.dashboard.variable; barGauge.new('Current Rate of Bytes Transmitted') + barGauge.options.withDisplayMode('basic') + barGauge.options.withShowUnfilled(false) - + barGauge.standardOptions.withUnit('Bps') + + barGauge.standardOptions.withUnit($._config.units.network) + barGauge.standardOptions.color.withMode('fixed') + barGauge.standardOptions.color.withFixedColor('green') + barGauge.queryOptions.withInterval($._config.grafanaK8s.minimumTimeInterval) @@ -125,7 +125,7 @@ local var = g.dashboard.variable; '${datasource}', ||| sort_desc(sum(rate(container_network_transmit_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace=~"$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config ) @@ -135,7 +135,7 @@ local var = g.dashboard.variable; barGauge.new('Average Rate of Bytes Received') + barGauge.options.withDisplayMode('basic') + barGauge.options.withShowUnfilled(false) - + barGauge.standardOptions.withUnit('Bps') + + barGauge.standardOptions.withUnit($._config.units.network) + barGauge.standardOptions.color.withMode('fixed') + barGauge.standardOptions.color.withFixedColor('green') + barGauge.queryOptions.withInterval($._config.grafanaK8s.minimumTimeInterval) @@ -144,7 +144,7 @@ local var = g.dashboard.variable; '${datasource}', ||| sort_desc(avg(rate(container_network_receive_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace=~"$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config ) @@ -154,7 +154,7 @@ local var = g.dashboard.variable; barGauge.new('Average Rate of Bytes Transmitted') + barGauge.options.withDisplayMode('basic') + barGauge.options.withShowUnfilled(false) - + barGauge.standardOptions.withUnit('Bps') + + barGauge.standardOptions.withUnit($._config.units.network) + barGauge.standardOptions.color.withMode('fixed') + barGauge.standardOptions.color.withFixedColor('green') + barGauge.queryOptions.withInterval($._config.grafanaK8s.minimumTimeInterval) @@ -163,7 +163,7 @@ local var = g.dashboard.variable; '${datasource}', ||| sort_desc(avg(rate(container_network_transmit_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace=~"$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config ) @@ -171,13 +171,13 @@ local var = g.dashboard.variable; ]), tsPanel.new('Receive Bandwidth') - + tsPanel.standardOptions.withUnit('binBps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', ||| sort_desc(sum(rate(container_network_receive_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace=~"$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config ) @@ -185,13 +185,13 @@ local var = g.dashboard.variable; ]), tsPanel.new('Transmit Bandwidth') - + tsPanel.standardOptions.withUnit('binBps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', ||| sort_desc(sum(rate(container_network_transmit_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace=~"$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config ) @@ -205,7 +205,7 @@ local var = g.dashboard.variable; '${datasource}', ||| sort_desc(sum(rate(container_network_receive_packets_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace=~"$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config ) @@ -219,7 +219,7 @@ local var = g.dashboard.variable; '${datasource}', ||| sort_desc(sum(rate(container_network_transmit_packets_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace=~"$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config ) @@ -233,7 +233,7 @@ local var = g.dashboard.variable; '${datasource}', ||| sort_desc(sum(rate(container_network_receive_packets_dropped_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace=~"$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config ) @@ -247,7 +247,7 @@ local var = g.dashboard.variable; '${datasource}', ||| sort_desc(sum(rate(container_network_transmit_packets_dropped_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace=~"$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config ) diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/cluster.libsonnet b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/cluster.libsonnet index e06522ad..565f4bff 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/cluster.libsonnet +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/cluster.libsonnet @@ -475,7 +475,7 @@ local var = g.dashboard.variable; properties: [ { id: 'unit', - value: 'Bps', + value: $._config.units.network, }, ], }, @@ -506,7 +506,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Receive Bandwidth') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', @@ -516,7 +516,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Transmit Bandwidth') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', @@ -526,7 +526,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Average Container Bandwidth by Namespace: Received') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', @@ -536,7 +536,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Average Container Bandwidth by Namespace: Transmitted') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', @@ -698,7 +698,7 @@ local var = g.dashboard.variable; properties: [ { id: 'unit', - value: 'Bps', + value: $._config.units.network, }, ], }, diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/namespace.libsonnet b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/namespace.libsonnet index 4423f896..e2455919 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/namespace.libsonnet +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/namespace.libsonnet @@ -547,7 +547,7 @@ local var = g.dashboard.variable; properties: [ { id: 'unit', - value: 'Bps', + value: $._config.units.network, }, ], }, @@ -578,7 +578,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Receive Bandwidth') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', @@ -588,7 +588,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Transmit Bandwidth') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', @@ -751,7 +751,7 @@ local var = g.dashboard.variable; properties: [ { id: 'unit', - value: 'Bps', + value: $._config.units.network, }, ], }, diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/pod.libsonnet b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/pod.libsonnet index ae623fc6..a1a87036 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/pod.libsonnet +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/pod.libsonnet @@ -448,7 +448,7 @@ local var = g.dashboard.variable; tsPanel.new('Receive Bandwidth') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', @@ -458,7 +458,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Transmit Bandwidth') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/workload-namespace.libsonnet b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/workload-namespace.libsonnet index 2f781fb7..4412de5f 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/workload-namespace.libsonnet +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/workload-namespace.libsonnet @@ -92,7 +92,7 @@ local var = g.dashboard.variable; local cpuUsageQuery = ||| sum( node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate5m{%(clusterLabel)s="$cluster", namespace="$namespace"} - * on(namespace,pod) + * on(%(clusterLabel)s, namespace, pod) group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", namespace="$namespace", workload_type=~"$type"} ) by (workload, workload_type) ||| % $._config; @@ -100,7 +100,7 @@ local var = g.dashboard.variable; local cpuRequestsQuery = ||| sum( kube_pod_container_resource_requests{%(kubeStateMetricsSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace", resource="cpu"} - * on(namespace,pod) + * on(%(clusterLabel)s, namespace, pod) group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", namespace="$namespace", workload_type=~"$type"} ) by (workload, workload_type) ||| % $._config; @@ -111,7 +111,7 @@ local var = g.dashboard.variable; local memUsageQuery = ||| sum( container_memory_working_set_bytes{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace", container!="", image!=""} - * on(namespace,pod) + * on(%(clusterLabel)s, namespace, pod) group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", namespace="$namespace", workload_type=~"$type"} ) by (workload, workload_type) ||| % $._config; @@ -126,32 +126,32 @@ local var = g.dashboard.variable; local networkColumns = [ ||| (sum(rate(container_network_receive_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload_type=~"$type"}) by (workload)) ||| % $._config, ||| (sum(rate(container_network_transmit_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload_type=~"$type"}) by (workload)) ||| % $._config, ||| (sum(rate(container_network_receive_packets_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload_type=~"$type"}) by (workload)) ||| % $._config, ||| (sum(rate(container_network_transmit_packets_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload_type=~"$type"}) by (workload)) ||| % $._config, ||| (sum(rate(container_network_receive_packets_dropped_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload_type=~"$type"}) by (workload)) ||| % $._config, ||| (sum(rate(container_network_transmit_packets_dropped_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload_type=~"$type"}) by (workload)) ||| % $._config, ]; @@ -600,7 +600,7 @@ local var = g.dashboard.variable; properties: [ { id: 'unit', - value: 'Bps', + value: $._config.units.network, }, ], }, @@ -631,13 +631,13 @@ local var = g.dashboard.variable; ]), tsPanel.new('Receive Bandwidth') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', ||| (sum(rate(container_network_receive_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~".+", workload_type=~"$type"}) by (workload)) ||| % $._config ) @@ -645,13 +645,13 @@ local var = g.dashboard.variable; ]), tsPanel.new('Transmit Bandwidth') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', ||| (sum(rate(container_network_transmit_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~".+", workload_type=~"$type"}) by (workload)) ||| % $._config ) @@ -659,13 +659,13 @@ local var = g.dashboard.variable; ]), tsPanel.new('Average Container Bandwidth by Workload: Received') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', ||| (avg(rate(container_network_receive_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~".+", workload_type=~"$type"}) by (workload)) ||| % $._config ) @@ -673,13 +673,13 @@ local var = g.dashboard.variable; ]), tsPanel.new('Average Container Bandwidth by Workload: Transmitted') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', ||| (avg(rate(container_network_transmit_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~".+", workload_type=~"$type"}) by (workload)) ||| % $._config ) @@ -693,7 +693,7 @@ local var = g.dashboard.variable; '${datasource}', ||| (sum(rate(container_network_receive_packets_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~".+", workload_type=~"$type"}) by (workload)) ||| % $._config ) @@ -707,7 +707,7 @@ local var = g.dashboard.variable; '${datasource}', ||| (sum(rate(container_network_transmit_packets_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~".+", workload_type=~"$type"}) by (workload)) ||| % $._config ) @@ -721,7 +721,7 @@ local var = g.dashboard.variable; '${datasource}', ||| (sum(rate(container_network_receive_packets_dropped_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~".+", workload_type=~"$type"}) by (workload)) ||| % $._config ) @@ -735,7 +735,7 @@ local var = g.dashboard.variable; '${datasource}', ||| (sum(rate(container_network_transmit_packets_dropped_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~".+", workload_type=~"$type"}) by (workload)) ||| % $._config ) diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/workload.libsonnet b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/workload.libsonnet index 996851c8..e3ce56b7 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/workload.libsonnet +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/workload.libsonnet @@ -104,7 +104,7 @@ local var = g.dashboard.variable; local cpuUsageQuery = ||| sum( node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate5m{%(clusterLabel)s="$cluster", namespace="$namespace"} - * on(namespace,pod) + * on(%(clusterLabel)s, namespace, pod) group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", namespace="$namespace", workload="$workload", workload_type=~"$type"} ) by (pod) ||| % $._config; @@ -112,7 +112,7 @@ local var = g.dashboard.variable; local cpuRequestsQuery = ||| sum( kube_pod_container_resource_requests{%(kubeStateMetricsSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace", resource="cpu"} - * on(namespace,pod) + * on(%(clusterLabel)s, namespace, pod) group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", namespace="$namespace", workload="$workload", workload_type=~"$type"} ) by (pod) ||| % $._config; @@ -122,7 +122,7 @@ local var = g.dashboard.variable; local memUsageQuery = ||| sum( container_memory_working_set_bytes{%(clusterLabel)s="$cluster", namespace="$namespace", container!="", image!=""} - * on(namespace,pod) + * on(%(clusterLabel)s, namespace, pod) group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", namespace="$namespace", workload="$workload", workload_type=~"$type"} ) by (pod) ||| % $._config; @@ -132,32 +132,32 @@ local var = g.dashboard.variable; local networkColumns = [ ||| (sum(rate(container_network_receive_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config, ||| (sum(rate(container_network_transmit_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config, ||| (sum(rate(container_network_receive_packets_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config, ||| (sum(rate(container_network_transmit_packets_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config, ||| (sum(rate(container_network_receive_packets_dropped_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config, ||| (sum(rate(container_network_transmit_packets_dropped_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config, ]; @@ -430,7 +430,7 @@ local var = g.dashboard.variable; properties: [ { id: 'unit', - value: 'Bps', + value: $._config.units.network, }, ], }, @@ -461,13 +461,13 @@ local var = g.dashboard.variable; ]), tsPanel.new('Receive Bandwidth') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', ||| (sum(rate(container_network_receive_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config ) @@ -475,13 +475,13 @@ local var = g.dashboard.variable; ]), tsPanel.new('Transmit Bandwidth') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', ||| (sum(rate(container_network_transmit_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config ) @@ -489,13 +489,13 @@ local var = g.dashboard.variable; ]), tsPanel.new('Average Container Bandwidth by Pod: Received') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', ||| (avg(rate(container_network_receive_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config ) @@ -503,13 +503,13 @@ local var = g.dashboard.variable; ]), tsPanel.new('Average Container Bandwidth by Pod: Transmitted') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', ||| (avg(rate(container_network_transmit_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config ) @@ -523,7 +523,7 @@ local var = g.dashboard.variable; '${datasource}', ||| (sum(rate(container_network_receive_packets_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config ) @@ -537,7 +537,7 @@ local var = g.dashboard.variable; '${datasource}', ||| (sum(rate(container_network_transmit_packets_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config ) @@ -551,7 +551,7 @@ local var = g.dashboard.variable; '${datasource}', ||| (sum(rate(container_network_receive_packets_dropped_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config ) @@ -565,7 +565,7 @@ local var = g.dashboard.variable; '${datasource}', ||| (sum(rate(container_network_transmit_packets_dropped_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}[%(grafanaIntervalVar)s]) - * on (namespace,pod) + * on (%(clusterLabel)s, namespace, pod) group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace", workload=~"$workload", workload_type=~"$type"}) by (pod)) ||| % $._config ) diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/windows.libsonnet b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/windows.libsonnet index 21e29dc0..a2b5688b 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/windows.libsonnet +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/windows.libsonnet @@ -896,7 +896,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Net Utilisation (Transmitted)') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', @@ -906,7 +906,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Net Utilisation (Dropped)') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', @@ -1067,7 +1067,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Net Utilisation (Transmitted)') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', @@ -1077,7 +1077,7 @@ local var = g.dashboard.variable; ]), tsPanel.new('Net Saturation (Dropped)') - + tsPanel.standardOptions.withUnit('Bps') + + tsPanel.standardOptions.withUnit($._config.units.network) + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/jsonnetfile.lock.json b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/jsonnetfile.lock.json new file mode 100644 index 00000000..cc27275c --- /dev/null +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/jsonnetfile.lock.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "dependencies": [ + { + "source": { + "git": { + "remote": "https://github.com/grafana/grafonnet.git", + "subdir": "gen/grafonnet-latest" + } + }, + "version": "82a19822e54a0a12a51e24dbd48fcde717dc0864", + "sum": "64fMUPI3frXGj4X1FqFd1t7r04w3CUSmXaDcJ23EYbQ=" + }, + { + "source": { + "git": { + "remote": "https://github.com/grafana/grafonnet.git", + "subdir": "gen/grafonnet-v11.1.0" + } + }, + "version": "82a19822e54a0a12a51e24dbd48fcde717dc0864", + "sum": "41w7p/rwrNsITqNHMXtGSJAfAyKmnflg6rFhKBduUxM=" + }, + { + "source": { + "git": { + "remote": "https://github.com/jsonnet-libs/docsonnet.git", + "subdir": "doc-util" + } + }, + "version": "6ac6c69685b8c29c54515448eaca583da2d88150", + "sum": "BrAL/k23jq+xy9oA7TWIhUx07dsA/QLm3g7ktCwe//U=" + }, + { + "source": { + "git": { + "remote": "https://github.com/jsonnet-libs/xtd.git", + "subdir": "" + } + }, + "version": "63d430b69a95741061c2f7fc9d84b1a778511d9c", + "sum": "qiZi3axUSXCVzKUF83zSAxklwrnitMmrDK4XAfjPMdE=" + } + ], + "legacyImports": false +} diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/lib/absent_alert.libsonnet b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/lib/absent_alert.libsonnet index 93b326e3..a37b7797 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/lib/absent_alert.libsonnet +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/lib/absent_alert.libsonnet @@ -5,7 +5,7 @@ alert: '%sDown' % absentAlert.componentName, expr: ||| - absent(up{%s} == 1) + absent(up{%s}) ||| % absentAlert.selector, 'for': '15m', labels: { diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/go.mod b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/go.mod index e7c34865..ca31fc0b 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/go.mod +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/go.mod @@ -1,15 +1,15 @@ module _ -go 1.25.0 +go 1.25.3 require ( github.com/Kunde21/markdownfmt/v3 v3.1.0 github.com/cloudflare/pint v0.76.1 - github.com/errata-ai/vale/v3 v3.12.0 + github.com/errata-ai/vale/v3 v3.13.0 github.com/google/go-jsonnet v0.21.0 github.com/grafana/dashboard-linter v0.0.0-20231114210226-c458893a5731 github.com/jsonnet-bundler/jsonnet-bundler v0.6.0 - github.com/prometheus/prometheus v0.307.1 + github.com/prometheus/prometheus v0.307.2 ) require ( diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/go.sum b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/go.sum index 350fbadc..f0298ca2 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/go.sum +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/go.sum @@ -271,8 +271,8 @@ github.com/errata-ai/ini v1.63.0 h1:XRFKXTn7FvF8mnC9RPOlYaL4Ud7dP0i35LnLcbIhWYU= github.com/errata-ai/ini v1.63.0/go.mod h1:PhjYff6ijif0unCnaJtXxnVsmlY95CSiNJDLXQYXdX8= github.com/errata-ai/regexp2 v1.7.0 h1:N+weOlhwTd5iyDTcTCAMljXnfzkftcOZrdXno6G+QPM= github.com/errata-ai/regexp2 v1.7.0/go.mod h1:59rO+jaxayJPF1WKI5m9R5F3Y3zR2Wn0DHnQbxtPm4A= -github.com/errata-ai/vale/v3 v3.12.0 h1:2yRMQl8f9dujNE26Y9g9+LU5OXidngLg5HftfIFi/4U= -github.com/errata-ai/vale/v3 v3.12.0/go.mod h1:BPNw4yScYrtxqvrca0T4UaiUGt2c05DUokXD91Sof3M= +github.com/errata-ai/vale/v3 v3.13.0 h1:WcAo/twOGechqBcXGPsbANNl58JIRr4+BMxud69NC6g= +github.com/errata-ai/vale/v3 v3.13.0/go.mod h1:+F21/J3QM9Qd6p0r5zXFSolRN65/leVGw3Gg/BbptF4= github.com/expr-lang/expr v1.17.0 h1:+vpszOyzKLQXC9VF+wA8cVA0tlA984/Wabc/1hF9Whg= github.com/expr-lang/expr v1.17.0/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4= github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb h1:IT4JYU7k4ikYg1SCxNI1/Tieq/NFvh6dzLdgi7eu0tM= @@ -731,8 +731,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg= github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is= -github.com/prometheus/prometheus v0.307.1 h1:Hh3kRMFn+xpQGLe/bR6qpUfW4GXQO0spuYeY7f2JZs4= -github.com/prometheus/prometheus v0.307.1/go.mod h1:/7YQG/jOLg7ktxGritmdkZvezE1fa6aWDj0MGDIZvcY= +github.com/prometheus/prometheus v0.307.2 h1:oA6J+sgS1iTEpsRjyKUYAe+3BzwpsYBqzeRchPOUZ/M= +github.com/prometheus/prometheus v0.307.2/go.mod h1:UeEsqN3iSmAASRE3qkAm3b/3ofdiTAqGdsz+Sj3F0KA= github.com/prometheus/sigv4 v0.2.1 h1:hl8D3+QEzU9rRmbKIRwMKRwaFGyLkbPdH5ZerglRHY0= github.com/prometheus/sigv4 v0.2.1/go.mod h1:ySk6TahIlsR2sxADuHy4IBFhwEjRGGsfbbLGhFYFj6Q= github.com/prymitive/current v0.1.1 h1:RNMYkRQV0M9H1ndtnvGIeUHG6P7vwRxoHn01KvHKuIs= diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/lgtm.yaml b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/lgtm.yaml index c0e61702..81125f9e 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/lgtm.yaml +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/scripts/lgtm.yaml @@ -48,6 +48,9 @@ spec: - containerPort: 4317 - containerPort: 4318 - containerPort: 9090 + env: + - name: ENABLE_LOGS_ALL + value: "true" readinessProbe: exec: command: diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/tests/absent_alert-test.yaml b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/tests/absent_alert-test.yaml new file mode 100644 index 00000000..1d487778 --- /dev/null +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/tests/absent_alert-test.yaml @@ -0,0 +1,98 @@ +rule_files: +- ../prometheus_alerts.yaml + +tests: +- interval: 1m + name: KubeAPIDown fires when kube-apiserver target is absent + input_series: + - series: 'up{job="kube-apiserver", instance="apiserver1"}' + values: '1 1 1 1 1 0 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _' + alert_rule_test: + - eval_time: 10m + alertname: KubeAPIDown + - eval_time: 25m + alertname: KubeAPIDown + exp_alerts: + - exp_labels: + severity: "critical" + job: "kube-apiserver" + exp_annotations: + description: "KubeAPI has disappeared from Prometheus target discovery." + summary: "Target disappeared from Prometheus target discovery." + runbook_url: "https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeapidown" + +- interval: 1m + name: KubeletDown fires when kubelet target is absent + input_series: + - series: 'up{job="kubelet", instance="node1"}' + values: '1 1 1 1 1 0 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _' + alert_rule_test: + - eval_time: 10m + alertname: KubeletDown + - eval_time: 25m + alertname: KubeletDown + exp_alerts: + - exp_labels: + severity: "critical" + job: "kubelet" + exp_annotations: + description: "Kubelet has disappeared from Prometheus target discovery." + summary: "Target disappeared from Prometheus target discovery." + runbook_url: "https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeletdown" + +- interval: 1m + name: KubeSchedulerDown fires when kube-scheduler target is absent + input_series: + - series: 'up{job="kube-scheduler", instance="scheduler1"}' + values: '1 1 1 1 1 0 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _' + alert_rule_test: + - eval_time: 10m + alertname: KubeSchedulerDown + - eval_time: 25m + alertname: KubeSchedulerDown + exp_alerts: + - exp_labels: + severity: "critical" + job: "kube-scheduler" + exp_annotations: + description: "KubeScheduler has disappeared from Prometheus target discovery." + summary: "Target disappeared from Prometheus target discovery." + runbook_url: "https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeschedulerdown" + +- interval: 1m + name: KubeControllerManagerDown fires when kube-controller-manager target is absent + input_series: + - series: 'up{job="kube-controller-manager", instance="controller1"}' + values: '1 1 1 1 1 0 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _' + alert_rule_test: + - eval_time: 10m + alertname: KubeControllerManagerDown + - eval_time: 25m + alertname: KubeControllerManagerDown + exp_alerts: + - exp_labels: + severity: "critical" + job: "kube-controller-manager" + exp_annotations: + description: "KubeControllerManager has disappeared from Prometheus target discovery." + summary: "Target disappeared from Prometheus target discovery." + runbook_url: "https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubecontrollermanagerdown" + +- interval: 1m + name: KubeProxyDown fires when kube-proxy target is absent + input_series: + - series: 'up{job="kube-proxy", instance="proxy1"}' + values: '1 1 1 1 1 0 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _' + alert_rule_test: + - eval_time: 10m + alertname: KubeProxyDown + - eval_time: 25m + alertname: KubeProxyDown + exp_alerts: + - exp_labels: + severity: "critical" + job: "kube-proxy" + exp_annotations: + description: "KubeProxy has disappeared from Prometheus target discovery." + summary: "Target disappeared from Prometheus target discovery." + runbook_url: "https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeproxydown" diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/tests/resource_alerts-test.yaml b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/tests/resource_alerts-test.yaml index 7dbf6cfb..4351bda6 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/tests/resource_alerts-test.yaml +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/tests/resource_alerts-test.yaml @@ -29,3 +29,84 @@ tests: description: "30% throttling of CPU in namespace default for container test-container in pod test-pod." summary: "Processes experience elevated CPU throttling." runbook_url: "https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-cputhrottlinghigh" + +- interval: 1m + name: KubeQuotaAlmostFull fires when quota usage is above 90% + input_series: + - series: 'kube_resourcequota{cluster="cluster1", namespace="test-ns", resource="requests.cpu", type="used", job="kube-state-metrics", instance="ksm1"}' + values: '95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95' + - series: 'kube_resourcequota{cluster="cluster1", namespace="test-ns", resource="requests.cpu", type="hard", job="kube-state-metrics", instance="ksm1"}' + values: '100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100' + - series: 'kube_resourcequota{cluster="cluster1", namespace="test-ns", resource="requests.cpu", type="used", job="kube-state-metrics", instance="ksm2"}' + values: '95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95' + - series: 'kube_resourcequota{cluster="cluster1", namespace="test-ns", resource="requests.cpu", type="hard", job="kube-state-metrics", instance="ksm2"}' + values: '100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100' + alert_rule_test: + - eval_time: 14m + alertname: KubeQuotaAlmostFull + - eval_time: 20m + alertname: KubeQuotaAlmostFull + exp_alerts: + - exp_labels: + severity: "info" + cluster: "cluster1" + namespace: "test-ns" + resource: "requests.cpu" + exp_annotations: + description: "Namespace test-ns is using 95% of its requests.cpu quota." + summary: "Namespace quota is going to be full." + runbook_url: "https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubequotaalmostfull" + +- interval: 1m + name: KubeQuotaFullyUsed fires when quota is 100% used + input_series: + - series: 'kube_resourcequota{cluster="cluster1", namespace="test-ns", resource="requests.memory", type="used", job="kube-state-metrics", instance="ksm1"}' + values: '100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100' + - series: 'kube_resourcequota{cluster="cluster1", namespace="test-ns", resource="requests.memory", type="hard", job="kube-state-metrics", instance="ksm1"}' + values: '100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100' + - series: 'kube_resourcequota{cluster="cluster1", namespace="test-ns", resource="requests.memory", type="used", job="kube-state-metrics", instance="ksm2"}' + values: '100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100' + - series: 'kube_resourcequota{cluster="cluster1", namespace="test-ns", resource="requests.memory", type="hard", job="kube-state-metrics", instance="ksm2"}' + values: '100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100' + alert_rule_test: + - eval_time: 14m + alertname: KubeQuotaFullyUsed + - eval_time: 20m + alertname: KubeQuotaFullyUsed + exp_alerts: + - exp_labels: + severity: "info" + cluster: "cluster1" + namespace: "test-ns" + resource: "requests.memory" + exp_annotations: + description: "Namespace test-ns is using 100% of its requests.memory quota." + summary: "Namespace quota is fully used." + runbook_url: "https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubequotafullyused" + +- interval: 1m + name: KubeQuotaExceeded fires when quota usage exceeds 100% + input_series: + - series: 'kube_resourcequota{cluster="cluster1", namespace="test-ns", resource="pods", type="used", job="kube-state-metrics", instance="ksm1"}' + values: '120 120 120 120 120 120 120 120 120 120 120 120 120 120 120 120 120 120 120 120' + - series: 'kube_resourcequota{cluster="cluster1", namespace="test-ns", resource="pods", type="hard", job="kube-state-metrics", instance="ksm1"}' + values: '100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100' + - series: 'kube_resourcequota{cluster="cluster1", namespace="test-ns", resource="pods", type="used", job="kube-state-metrics", instance="ksm2"}' + values: '120 120 120 120 120 120 120 120 120 120 120 120 120 120 120 120 120 120 120 120' + - series: 'kube_resourcequota{cluster="cluster1", namespace="test-ns", resource="pods", type="hard", job="kube-state-metrics", instance="ksm2"}' + values: '100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100 100' + alert_rule_test: + - eval_time: 14m + alertname: KubeQuotaExceeded + - eval_time: 20m + alertname: KubeQuotaExceeded + exp_alerts: + - exp_labels: + severity: "warning" + cluster: "cluster1" + namespace: "test-ns" + resource: "pods" + exp_annotations: + description: "Namespace test-ns is using 120% of its pods quota." + summary: "Namespace quota has exceeded the limits." + runbook_url: "https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubequotaexceeded" diff --git a/vendor/github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus/addons/all-namespaces.libsonnet b/vendor/github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus/addons/all-namespaces.libsonnet index 568ba476..433009bd 100644 --- a/vendor/github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus/addons/all-namespaces.libsonnet +++ b/vendor/github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus/addons/all-namespaces.libsonnet @@ -2,6 +2,11 @@ prometheus+: { clusterRole+: { rules+: [ + { + apiGroups: ['discovery.k8s.io'], + resources: ['endpointslices'], + verbs: ['get', 'list', 'watch'], + }, { apiGroups: [''], resources: ['services', 'endpoints', 'pods'], diff --git a/vendor/github.com/pyrra-dev/pyrra/jsonnet/controller-gen/pyrra.dev_servicelevelobjectives.json b/vendor/github.com/pyrra-dev/pyrra/jsonnet/controller-gen/pyrra.dev_servicelevelobjectives.json index 7b44eb1c..3a9aa317 100644 --- a/vendor/github.com/pyrra-dev/pyrra/jsonnet/controller-gen/pyrra.dev_servicelevelobjectives.json +++ b/vendor/github.com/pyrra-dev/pyrra/jsonnet/controller-gen/pyrra.dev_servicelevelobjectives.json @@ -3,7 +3,7 @@ "kind": "CustomResourceDefinition", "metadata": { "annotations": { - "controller-gen.kubebuilder.io/version": "v0.14.0" + "controller-gen.kubebuilder.io/version": "v0.18.0" }, "name": "servicelevelobjectives.pyrra.dev" },