From 6ab8e9e64f9910197b67c5889a4382a89ba59b56 Mon Sep 17 00:00:00 2001 From: Shanel Huang Date: Tue, 12 Aug 2025 13:35:16 -0400 Subject: [PATCH] Revert "Update OOTB K8s Dashboards for OTel (#20938)" This reverts commit 88ba45b0247c5e02b282c1131b01bfb6c27e02d9. --- .../dashboards/kubernetes_clusters.json | 338 ++++++------------ .../dashboards/kubernetes_cpu_memory.json | 195 ++++------ .../dashboards/kubernetes_daemonsets.json | 99 ++--- .../dashboards/kubernetes_dashboard.json | 141 +++----- .../dashboards/kubernetes_deployments.json | 129 +++---- .../assets/dashboards/kubernetes_jobs.json | 141 +++----- .../assets/dashboards/kubernetes_nodes.json | 112 ++---- .../assets/dashboards/kubernetes_pods.json | 87 ++--- .../dashboards/kubernetes_replicasets.json | 102 ++---- .../dashboards/kubernetes_services.json | 48 +-- .../dashboards/kubernetes_statefulsets.json | 96 ++--- 11 files changed, 497 insertions(+), 991 deletions(-) diff --git a/kubernetes/assets/dashboards/kubernetes_clusters.json b/kubernetes/assets/dashboards/kubernetes_clusters.json index 5095e04fb11b2..df32e17ffc524 100644 --- a/kubernetes/assets/dashboards/kubernetes_clusters.json +++ b/kubernetes/assets/dashboards/kubernetes_clusters.json @@ -83,15 +83,13 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.cpu.requests{$cluster,$scope}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" }, { "data_source": "metrics", "name": "query2", "query": "sum:kubernetes_state.node.cpu_allocatable{$cluster,$scope}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -148,20 +146,17 @@ { "data_source": "metrics", "name": "query3", - "query": "sum:kubernetes_state.node.cpu_capacity{$cluster,$scope}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.node.cpu_capacity{$cluster,$scope}" }, { "data_source": "metrics", "name": "query4", - "query": "sum:kubernetes_state.node.cpu_allocatable{$cluster,$scope}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.node.cpu_allocatable{$cluster,$scope}" }, { "data_source": "metrics", "name": "query5", - "query": "sum:kubernetes.cpu.requests{$cluster,$scope}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.requests{$cluster,$scope}" } ], "response_format": "timeseries", @@ -221,15 +216,13 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.memory.requests{$cluster,$scope}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" }, { "data_source": "metrics", "name": "query2", "query": "sum:kubernetes_state.node.memory_allocatable{$cluster,$scope}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -286,20 +279,17 @@ { "data_source": "metrics", "name": "query3", - "query": "sum:kubernetes_state.node.memory_capacity{$cluster,$scope}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.node.memory_capacity{$cluster,$scope}" }, { "data_source": "metrics", "name": "query6", - "query": "sum:kubernetes_state.node.memory_allocatable{$cluster,$scope}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.node.memory_allocatable{$cluster,$scope}" }, { "data_source": "metrics", "name": "query4", - "query": "sum:kubernetes.memory.requests{$cluster,$scope}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.requests{$cluster,$scope}" } ], "response_format": "timeseries", @@ -359,15 +349,13 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.pods.running{$cluster,$scope}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" }, { "data_source": "metrics", "name": "query2", "query": "sum:kubernetes_state.node.pods_capacity{$cluster,$scope}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -410,20 +398,17 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.node.pods_capacity{$cluster,$scope}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.node.pods_capacity{$cluster,$scope}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes_state.node.pods_allocatable{$cluster,$scope}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.node.pods_allocatable{$cluster,$scope}" }, { "data_source": "metrics", "name": "query3", - "query": "sum:kubernetes.pods.running{$cluster,$scope}", - "semantic_mode": "combined" + "query": "sum:kubernetes.pods.running{$cluster,$scope}" } ], "formulas": [ @@ -496,8 +481,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.filesystem.usage_pct{$scope,$cluster} by {kube_cluster_name}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -540,8 +524,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.filesystem.usage{$scope,$cluster}", - "semantic_mode": "combined" + "query": "sum:kubernetes.filesystem.usage{$scope,$cluster}" } ], "formulas": [ @@ -608,8 +591,7 @@ "data_source": "metrics", "name": "query1", "query": "avg:kubernetes.pods.running{$scope,$cluster} by {kube_cluster_name}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -643,8 +625,7 @@ "data_source": "metrics", "name": "query1", "query": "avg:kubernetes.pods.running{*,*,*,*,*,*,*,*,$scope,$cluster} by {kube_cluster_name,kube_namespace}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -679,8 +660,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.service.count{*,*,*,*,*,*,*,*,$scope,$cluster}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ] } @@ -710,8 +690,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.statefulset.replicas{$scope,$cluster} by {kube_cluster_name,kube_namespace,kube_stateful_set}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -746,8 +725,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.pods.running{$scope,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -807,8 +785,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.node.count{$scope,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -838,8 +815,7 @@ "data_source": "metrics", "name": "query1", "query": "avg:kubernetes_state.daemonset.desired{*,*,*,*,*,*,*,*,$scope,$cluster} by {kube_cluster_name,kube_namespace,kube_daemon_set}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -874,8 +850,7 @@ "data_source": "metrics", "name": "query1", "query": "avg:kubernetes_state.deployment.replicas{$scope,$cluster} by {kube_namespace,kube_deployment,kube_cluster_name}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -909,8 +884,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.job.count{$scope,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -940,8 +914,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.containers.running{*,*,*,*,*,*,*,*,$scope,$cluster}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ] } @@ -996,8 +969,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.crd.count{$scope,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -1058,8 +1030,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.node.count{$scope,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -1101,8 +1072,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.nodes.by_condition{status:true,!condition:ready,$scope,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -1139,13 +1109,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.nodes.by_condition{status:true,$scope,$cluster,!condition:ready} by {status,condition,kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.nodes.by_condition{status:true,$scope,$cluster,!condition:ready} by {status,condition,kube_cluster_name}" } ], "formulas": [ { - "formula": "top(query1, 10, 'last', 'desc')", + "formula": "top(query1, 10, \"last\", \"desc\")", "alias": "Nodes Not Ready" } ], @@ -1194,8 +1163,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.nodes.by_condition{status:true,!condition:ready,$scope,$cluster} by {status,condition,kube_cluster_name}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -1319,8 +1287,7 @@ { "data_source": "metrics", "name": "query1", - "query": "avg:system.cpu.idle{$scope,$cluster} by {host}", - "semantic_mode": "combined" + "query": "avg:system.cpu.idle{$scope,$cluster} by {host}" } ], "formulas": [ @@ -1359,8 +1326,7 @@ { "data_source": "metrics", "name": "query1", - "query": "avg:kubernetes.memory.usage_pct{$scope,$cluster} by {host}", - "semantic_mode": "combined" + "query": "avg:kubernetes.memory.usage_pct{$scope,$cluster} by {host}" } ], "formulas": [ @@ -1403,8 +1369,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.node.cpu_capacity{$scope,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -1441,8 +1406,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.node.memory_capacity{$scope,$cluster}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ] } @@ -1485,8 +1449,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.cpu.requests{$scope,$cluster} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.requests{$scope,$cluster} by {host}" } ], "response_format": "timeseries", @@ -1535,8 +1498,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.memory.requests{$scope,$cluster} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.requests{$scope,$cluster} by {host}" } ], "formulas": [ @@ -1608,8 +1570,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.deployment.replicas{$scope,$cluster} by {kube_deployment}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -1651,8 +1612,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.deployment.replicas_available{$scope,*,*,*,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -1690,8 +1650,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.deployment.replicas_updated{$scope,*,*,*,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -1729,15 +1688,13 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.deployment.replicas{$scope,*,*,*,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" }, { "data_source": "metrics", "name": "query2", "query": "sum:kubernetes_state.deployment.replicas_updated{$scope,*,*,*,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -1785,8 +1742,7 @@ "name": "query1", "data_source": "metrics", "query": "sum:kubernetes_state.deployment.replicas{$scope,$cluster} by {kube_cluster_name,kube_namespace,kube_deployment}", - "aggregator": "sum", - "semantic_mode": "combined" + "aggregator": "sum" } ] } @@ -1843,8 +1799,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.deployment.replicas_desired{$scope,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -1882,8 +1837,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.deployment.replicas_desired{$scope,$cluster} by {kube_deployment}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.deployment.replicas_desired{$scope,$cluster} by {kube_deployment}" } ], "formulas": [ @@ -1943,8 +1897,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.deployment.replicas_unavailable{$scope,*,*,*,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -1983,8 +1936,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.deployment.replicas_unavailable{$scope,$cluster} by {kube_deployment}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.deployment.replicas_unavailable{$scope,$cluster} by {kube_deployment}" } ], "formulas": [ @@ -2040,8 +1992,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.deployment.replicas{$scope,*,*,*,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -2080,8 +2031,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.deployment.replicas_available{$scope,$cluster} by {kube_deployment}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.deployment.replicas_available{$scope,$cluster} by {kube_deployment}" } ], "formulas": [ @@ -2141,15 +2091,13 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.deployment.replicas_desired{$scope,*,*,*,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" }, { "data_source": "metrics", "name": "query2", "query": "sum:kubernetes_state.deployment.replicas_available{$scope,*,*,*,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -2194,14 +2142,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.deployment.replicas_desired{$scope,$cluster} by {kube_deployment}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.deployment.replicas_desired{$scope,$cluster} by {kube_deployment}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes_state.deployment.replicas_available{$scope,$cluster} by {kube_deployment}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.deployment.replicas_available{$scope,$cluster} by {kube_deployment}" } ], "formulas": [ @@ -2275,8 +2221,7 @@ "data_source": "metrics", "name": "query1", "query": "avg:kubernetes_state.daemonset.desired{$scope,$cluster} by {kube_cluster_name,kube_namespace,kube_daemon_set}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -2319,8 +2264,7 @@ { "data_source": "metrics", "name": "query1", - "query": "avg:kubernetes_state.daemonset.desired{$scope,$cluster} by {kube_daemon_set}", - "semantic_mode": "combined" + "query": "avg:kubernetes_state.daemonset.desired{$scope,$cluster} by {kube_daemon_set}" } ], "formulas": [ @@ -2375,8 +2319,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.daemonset.scheduled{$scope,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -2413,8 +2356,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.daemonset.misscheduled{$scope,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -2477,8 +2419,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.daemonset.ready{$cluster,$scope}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -2517,8 +2458,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.daemonset.ready{$scope,$cluster} by {kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.daemonset.ready{$scope,$cluster} by {kube_daemon_set}" } ], "formulas": [ @@ -2574,8 +2514,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.daemonset.desired{$cluster,$scope}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -2613,8 +2552,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.daemonset.desired{$cluster,$scope} by {kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.daemonset.desired{$cluster,$scope} by {kube_daemon_set}" } ], "formulas": [ @@ -2688,8 +2626,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.statefulset.replicas{$scope,$cluster} by {kube_cluster_name,kube_namespace,kube_stateful_set}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -2728,8 +2665,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.statefulset.replicas{$scope,$cluster} by {kube_namespace,kube_cluster_name,kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.statefulset.replicas{$scope,$cluster} by {kube_namespace,kube_cluster_name,kube_stateful_set}" } ], "formulas": [ @@ -2784,8 +2720,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.statefulset.replicas_current{$scope,$cluster} by {kube_cluster_name,kube_namespace,kube_stateful_set}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -2822,8 +2757,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.statefulset.replicas_ready{$scope,$cluster} by {kube_cluster_name,kube_namespace,kube_stateful_set}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -2860,8 +2794,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.statefulset.replicas_updated{$scope,$cluster} by {kube_cluster_name,kube_namespace,kube_stateful_set}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -2899,8 +2832,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.statefulset.replicas_desired{$scope,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -2938,8 +2870,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.statefulset.replicas_desired{$scope,$cluster} by {kube_cluster_name,kube_namespace,kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.statefulset.replicas_desired{$scope,$cluster} by {kube_cluster_name,kube_namespace,kube_stateful_set}" } ], "formulas": [ @@ -2999,8 +2930,7 @@ "name": "query1", "data_source": "metrics", "query": "sum:kubernetes_state.statefulset.replicas{$scope,$cluster} by {kube_cluster_name,kube_namespace,kube_stateful_set}", - "aggregator": "sum", - "semantic_mode": "combined" + "aggregator": "sum" } ] } @@ -3055,8 +2985,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.job.count{$scope,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -3099,8 +3028,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.job.count{$cluster,$scope}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.job.count{$cluster,$scope}" } ], "response_format": "timeseries", @@ -3150,8 +3078,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.job.succeeded{$scope,$cluster}.as_count()", - "aggregator": "sum", - "semantic_mode": "combined" + "aggregator": "sum" } ] } @@ -3194,8 +3121,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.job.succeeded{$cluster,$scope}.as_count()", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.job.succeeded{$cluster,$scope}.as_count()" } ], "response_format": "timeseries", @@ -3245,8 +3171,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.job.failed{$scope,$cluster}.as_count()", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -3289,8 +3214,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.job.failed{$cluster,$scope}.as_count()", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.job.failed{$cluster,$scope}.as_count()" } ], "response_format": "timeseries", @@ -3346,8 +3270,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.job.count{$cluster,owner_kind:cronjob} by {owner_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.job.count{$cluster,owner_kind:cronjob} by {owner_name}" } ], "response_format": "timeseries", @@ -3416,8 +3339,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.replicaset.replicas{$scope,$cluster} by {kube_cluster_name,kube_namespace,kube_replica_set}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -3459,8 +3381,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.replicaset.replicas{$scope,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -3497,8 +3418,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.replicaset.replicas_desired{$scope,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -3536,8 +3456,7 @@ { "data_source": "metrics", "name": "query1", - "query": "avg:kubernetes_state.replicaset.replicas{$scope,$cluster} by {kube_cluster_name,kube_namespace,kube_replica_set}", - "semantic_mode": "combined" + "query": "avg:kubernetes_state.replicaset.replicas{$scope,$cluster} by {kube_cluster_name,kube_namespace,kube_replica_set}" } ], "formulas": [ @@ -3613,8 +3532,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.replicaset.replicas_ready{$scope,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -3652,15 +3570,13 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.replicaset.replicas_desired{$scope,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" }, { "data_source": "metrics", "name": "query2", "query": "sum:kubernetes_state.replicaset.replicas_ready{$scope,$cluster}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -3704,14 +3620,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.replicaset.replicas_desired{$scope,$cluster} by {kube_cluster_name,kube_namespace,kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.replicaset.replicas_desired{$scope,$cluster} by {kube_cluster_name,kube_namespace,kube_replica_set}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes_state.replicaset.replicas_ready{$scope,$cluster} by {kube_cluster_name,kube_namespace,kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.replicaset.replicas_ready{$scope,$cluster} by {kube_cluster_name,kube_namespace,kube_replica_set}" } ], "formulas": [ @@ -3771,8 +3685,7 @@ "name": "query1", "data_source": "metrics", "query": "top(avg:kubernetes_state.replicaset.replicas{$scope,$cluster} by {kube_cluster_name,kube_namespace,kube_replica_set}, 10, 'mean', 'desc')", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ] } @@ -3827,8 +3740,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.pods.running{$cluster,$scope} by {kube_cluster_name,kube_namespace}", - "semantic_mode": "combined" + "query": "sum:kubernetes.pods.running{$cluster,$scope} by {kube_cluster_name,kube_namespace}" } ], "formulas": [ @@ -3899,8 +3811,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.pods.running{*,$cluster,$scope} by {kube_cluster_name,kube_namespace}", - "aggregator": "max", - "semantic_mode": "combined" + "aggregator": "max" } ], "formulas": [ @@ -3945,8 +3856,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.container.status_report.count.waiting{$cluster,reason:crashloopbackoff,*,$scope} by {pod_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.container.status_report.count.waiting{$cluster,reason:crashloopbackoff,*,$scope} by {pod_name}" } ], "style": { @@ -4033,8 +3943,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.pod.ready{*,$cluster,condition:true,$scope} by {kube_cluster_name,host,nodepool}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -4090,8 +3999,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.pod.status_phase{*,$cluster,!pod_phase:running,!pod_phase:succeeded,$scope} by {cluster_name,kube_namespace,pod_phase}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -4143,8 +4051,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.pods.running{$cluster,$scope} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.pods.running{$cluster,$scope} by {host}" } ], "formulas": [ @@ -4218,8 +4125,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.service.count{$scope,$cluster} by {kube_cluster_name}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -4257,8 +4163,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.service.count{$scope,$cluster} by {type,kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.service.count{$scope,$cluster} by {type,kube_cluster_name}" } ], "formulas": [ @@ -4315,8 +4220,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.pods.running{$cluster,$scope} by {kube_service,kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.pods.running{$cluster,$scope} by {kube_service,kube_cluster_name}" } ], "formulas": [ @@ -4412,26 +4316,22 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.container.ready{$cluster,$scope}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.container.ready{$cluster,$scope}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes_state.container.running{$cluster,$scope}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.container.running{$cluster,$scope}" }, { "data_source": "metrics", "name": "query3", - "query": "sum:kubernetes_state.container.terminated{$cluster,$scope}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.container.terminated{$cluster,$scope}" }, { "data_source": "metrics", "name": "query4", - "query": "sum:kubernetes_state.container.status_report.count.waiting{$cluster,$scope}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.container.status_report.count.waiting{$cluster,$scope}" } ], "formulas": [ @@ -4492,8 +4392,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.container.restarts{$scope,$cluster,*,*,*,*,*} by {pod_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.container.restarts{$scope,$cluster,*,*,*,*,*} by {pod_name}" } ], "style": { @@ -4548,8 +4447,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.container.status_report.count.waiting{$cluster,reason:crashloopbackoff,$scope} by {pod_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.container.status_report.count.waiting{$cluster,reason:crashloopbackoff,$scope} by {pod_name}" } ], "response_format": "timeseries", @@ -4611,8 +4509,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.containers.state.terminated{$cluster,reason:oomkilled,$scope} by {pod_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.containers.state.terminated{$cluster,reason:oomkilled,$scope} by {pod_name}" } ], "response_format": "timeseries", @@ -4691,8 +4588,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.rx_bytes{$scope,$cluster} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.rx_bytes{$scope,$cluster} by {host}" } ], "formulas": [ @@ -4749,8 +4645,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.io.write_bytes{$scope,$cluster} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.io.write_bytes{$scope,$cluster} by {host}" } ], "formulas": [ @@ -4802,8 +4697,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.rx_errors{$scope,$cluster} by {pod_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.rx_errors{$scope,$cluster} by {pod_name}" } ], "style": { @@ -4819,8 +4713,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.tx_errors{$scope,$cluster} by {pod_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.tx_errors{$scope,$cluster} by {pod_name}" } ], "style": { @@ -4873,8 +4766,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.tx_bytes{$scope,$cluster} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.tx_bytes{$scope,$cluster} by {host}" } ], "formulas": [ @@ -4931,8 +4823,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.io.read_bytes{$scope,$cluster} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.io.read_bytes{$scope,$cluster} by {host}" } ], "formulas": [ @@ -4984,8 +4875,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.rx_errors{$scope,$cluster} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.rx_errors{$scope,$cluster} by {host}" } ], "style": { @@ -4999,8 +4889,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.tx_errors{$scope,$cluster} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.tx_errors{$scope,$cluster} by {host}" } ], "style": { @@ -5014,8 +4903,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network_errors{$scope,$cluster} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network_errors{$scope,$cluster} by {host}" } ], "style": { diff --git a/kubernetes/assets/dashboards/kubernetes_cpu_memory.json b/kubernetes/assets/dashboards/kubernetes_cpu_memory.json index aa6d488a37c87..8255cca2b7a1d 100644 --- a/kubernetes/assets/dashboards/kubernetes_cpu_memory.json +++ b/kubernetes/assets/dashboards/kubernetes_cpu_memory.json @@ -128,29 +128,25 @@ "query": "sum:kubernetes.cpu.requests{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env}", "data_source": "metrics", "name": "query1", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:kubernetes.cpu.usage.total{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env}", "data_source": "metrics", "name": "query7", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:kubernetes.memory.requests{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env}", "data_source": "metrics", "name": "query5", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:kubernetes.memory.usage{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env}", "data_source": "metrics", "name": "query8", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "sort": { @@ -254,43 +250,37 @@ "query": "sum:kubernetes.cpu.requests{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", "name": "query1", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:kubernetes.cpu.limits{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", "name": "query2", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:kubernetes.cpu.usage.total{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", "name": "query7", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:kubernetes.memory.requests{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", "name": "query5", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:kubernetes.memory.limits{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", "name": "query6", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:kubernetes.memory.usage{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", "name": "query8", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "sort": { @@ -369,15 +359,13 @@ "query": "sum:kubernetes.cpu.requests{$scope,$env,$kube_namespace,$kube_cluster_name ,kube_deployment:*} by {kube_cluster_name,kube_deployment}", "data_source": "metrics", "name": "query1", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:kubernetes.cpu.usage.total{$scope,$env,$kube_namespace,$kube_cluster_name ,kube_deployment:*} by {kube_cluster_name,kube_deployment}", "data_source": "metrics", "name": "query7", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -409,15 +397,13 @@ "query": "sum:kubernetes.memory.requests{$scope,$env,$kube_namespace,$kube_cluster_name ,kube_deployment:*} by {kube_cluster_name,kube_deployment}", "data_source": "metrics", "name": "query5", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:kubernetes.memory.usage{$scope,$env,$kube_namespace,$kube_cluster_name ,kube_deployment:*} by {kube_cluster_name,kube_deployment}", "data_source": "metrics", "name": "query8", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -449,15 +435,13 @@ "query": "sum:kubernetes.cpu.requests{$scope,$env,$kube_namespace,$kube_cluster_name, kube_daemon_set:*} by {kube_cluster_name,kube_daemon_set}", "data_source": "metrics", "name": "query1", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:kubernetes.cpu.usage.total{$scope,$env,$kube_namespace,$kube_cluster_name,kube_daemon_set:*} by {kube_cluster_name,kube_daemon_set}", "data_source": "metrics", "name": "query7", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -489,15 +473,13 @@ "query": "sum:kubernetes.memory.requests{$scope,$env,$kube_namespace,$kube_cluster_name,kube_daemon_set:*} by {kube_cluster_name,kube_daemon_set}", "data_source": "metrics", "name": "query5", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:kubernetes.memory.usage{$scope,$env,$kube_namespace,$kube_cluster_name,kube_daemon_set:*} by {kube_cluster_name,kube_daemon_set}", "data_source": "metrics", "name": "query8", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -570,57 +552,49 @@ "query": "sum:kubernetes.cpu.requests{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", "name": "query1", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:kubernetes.cpu.usage.total{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", "name": "query7", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:kubernetes.memory.requests{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", "name": "query5", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:kubernetes.memory.usage{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", "name": "query8", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "avg:kubernetes.cpu.usage.total{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", "name": "query9", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "avg:kubernetes.memory.usage{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", "name": "query10", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:kubernetes.cpu.limits{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", "name": "query2", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:kubernetes.memory.limits{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", "name": "query6", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "sort": { @@ -735,38 +709,32 @@ { "query": "sum:kubernetes.cpu.requests{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query1", - "semantic_mode": "combined" + "name": "query1" }, { "query": "sum:kubernetes.cpu.usage.total{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query7", - "semantic_mode": "combined" + "name": "query7" }, { "query": "sum:kubernetes.memory.requests{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query5", - "semantic_mode": "combined" + "name": "query5" }, { "query": "sum:kubernetes.memory.usage{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query8", - "semantic_mode": "combined" + "name": "query8" }, { "query": "sum:kubernetes.cpu.limits{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query2", - "semantic_mode": "combined" + "name": "query2" }, { "query": "sum:kubernetes.memory.limits{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query6", - "semantic_mode": "combined" + "name": "query6" } ], "response_format": "timeseries", @@ -816,38 +784,32 @@ { "query": "sum:kubernetes.cpu.requests{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query1", - "semantic_mode": "combined" + "name": "query1" }, { "query": "sum:kubernetes.cpu.usage.total{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query7", - "semantic_mode": "combined" + "name": "query7" }, { "query": "sum:kubernetes.memory.requests{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query5", - "semantic_mode": "combined" + "name": "query5" }, { "query": "sum:kubernetes.memory.usage{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query8", - "semantic_mode": "combined" + "name": "query8" }, { "query": "sum:kubernetes.cpu.limits{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query2", - "semantic_mode": "combined" + "name": "query2" }, { "query": "sum:kubernetes.memory.limits{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query6", - "semantic_mode": "combined" + "name": "query6" } ], "formulas": [ @@ -936,38 +898,32 @@ { "query": "avg:kubernetes.cpu.usage.total{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query7", - "semantic_mode": "combined" + "name": "query7" }, { "query": "avg:kubernetes.cpu.requests{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query1", - "semantic_mode": "combined" + "name": "query1" }, { "query": "sum:kubernetes.memory.requests{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query5", - "semantic_mode": "combined" + "name": "query5" }, { "query": "sum:kubernetes.memory.usage{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query8", - "semantic_mode": "combined" + "name": "query8" }, { "query": "sum:kubernetes.cpu.limits{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query2", - "semantic_mode": "combined" + "name": "query2" }, { "query": "sum:kubernetes.memory.limits{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query6", - "semantic_mode": "combined" + "name": "query6" } ], "response_format": "timeseries", @@ -989,8 +945,7 @@ { "data_source": "metrics", "name": "query0", - "query": "avg:kubernetes.cpu.requests{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", - "semantic_mode": "combined" + "query": "avg:kubernetes.cpu.requests{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}" } ], "response_format": "timeseries", @@ -1043,38 +998,32 @@ { "query": "avg:kubernetes.memory.usage{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query8", - "semantic_mode": "combined" + "name": "query8" }, { "query": "avg:kubernetes.memory.requests{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query5", - "semantic_mode": "combined" + "name": "query5" }, { "query": "sum:kubernetes.cpu.requests{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query1", - "semantic_mode": "combined" + "name": "query1" }, { "query": "sum:kubernetes.cpu.usage.total{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query7", - "semantic_mode": "combined" + "name": "query7" }, { "query": "sum:kubernetes.cpu.limits{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query2", - "semantic_mode": "combined" + "name": "query2" }, { "query": "sum:kubernetes.memory.limits{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", "data_source": "metrics", - "name": "query6", - "semantic_mode": "combined" + "name": "query6" } ], "response_format": "timeseries", @@ -1096,8 +1045,7 @@ { "data_source": "metrics", "name": "query0", - "query": "avg:kubernetes.memory.requests{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}", - "semantic_mode": "combined" + "query": "avg:kubernetes.memory.requests{$scope,$env,$kube_namespace,$kube_cluster_name,$kube_deployment,$kube_daemon_set,$kube_stateful_set} by {kube_cluster_name,env,kube_deployment,kube_daemon_set,kube_stateful_set}" } ], "response_format": "timeseries", @@ -1156,50 +1104,43 @@ "query": "sum:kubernetes.cpu.requests{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env}", "data_source": "metrics", "name": "query1", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:kubernetes.cpu.limits{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env}", "data_source": "metrics", "name": "query2", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:kubernetes.cpu.usage.total{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env}", "data_source": "metrics", "name": "query7", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:system.cpu.num_cores{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env}", "data_source": "metrics", "name": "query3", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "avg:system.cpu.idle{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env}", "data_source": "metrics", "name": "query4", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "avg:system.cpu.system{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env}", "data_source": "metrics", "name": "query5", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "avg:system.cpu.user{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env}", "data_source": "metrics", "name": "query6", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "sort": { @@ -1275,43 +1216,37 @@ "query": "sum:kubernetes.memory.requests{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env}", "data_source": "metrics", "name": "query1", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:kubernetes.memory.limits{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env}", "data_source": "metrics", "name": "query2", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:kubernetes.memory.usage{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env}", "data_source": "metrics", "name": "query6", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:system.mem.total{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env}", "data_source": "metrics", "name": "query3", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:system.mem.free{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env}", "data_source": "metrics", "name": "query4", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "query": "sum:system.mem.used{$scope,$env,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,env}", "data_source": "metrics", "name": "query5", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "sort": { diff --git a/kubernetes/assets/dashboards/kubernetes_daemonsets.json b/kubernetes/assets/dashboards/kubernetes_daemonsets.json index 45082481296ca..e921018075050 100644 --- a/kubernetes/assets/dashboards/kubernetes_daemonsets.json +++ b/kubernetes/assets/dashboards/kubernetes_daemonsets.json @@ -30,8 +30,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.daemonset.ready{$scope,$kube_cluster_name,$kube_namespace,$kube_daemon_set}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -62,8 +61,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.daemonset.ready{$scope,$kube_cluster_name,$kube_namespace,$kube_daemon_set} by {kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.daemonset.ready{$scope,$kube_cluster_name,$kube_namespace,$kube_daemon_set} by {kube_daemon_set}" } ], "style": { @@ -112,8 +110,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.daemonset.desired{$scope,$kube_cluster_name,$kube_namespace,$kube_daemon_set}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -144,8 +141,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.daemonset.desired{$scope,$kube_cluster_name,$kube_namespace,$kube_daemon_set} by {kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.daemonset.desired{$scope,$kube_cluster_name,$kube_namespace,$kube_daemon_set} by {kube_daemon_set}" } ], "style": { @@ -188,14 +184,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.daemonset.desired{$scope,$kube_cluster_name,$kube_namespace,$kube_daemon_set} by {kube_cluster_name,kube_namespace,kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.daemonset.desired{$scope,$kube_cluster_name,$kube_namespace,$kube_daemon_set} by {kube_cluster_name,kube_namespace,kube_daemon_set}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes_state.daemonset.ready{$scope,$kube_cluster_name,$kube_namespace,$kube_daemon_set} by {kube_cluster_name,kube_namespace,kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.daemonset.ready{$scope,$kube_cluster_name,$kube_namespace,$kube_daemon_set} by {kube_cluster_name,kube_namespace,kube_daemon_set}" } ], "formulas": [ @@ -262,8 +256,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.daemonset.ready{$scope,$kube_namespace,$kube_cluster_name,$kube_daemon_set} by {kube_cluster_name,kube_namespace,kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.daemonset.ready{$scope,$kube_namespace,$kube_cluster_name,$kube_daemon_set} by {kube_cluster_name,kube_namespace,kube_daemon_set}" } ], "style": { @@ -317,8 +310,7 @@ "name": "query1", "data_source": "metrics", "query": "top(avg:kubernetes_state.daemonset.ready{$scope,$kube_namespace,$kube_cluster_name,$kube_daemon_set} by {kube_cluster_name,kube_namespace,kube_replica_set}, 10, 'mean', 'desc')", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ] } @@ -347,14 +339,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.daemonset.desired{$scope,$kube_cluster_name,$kube_namespace,$kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.daemonset.desired{$scope,$kube_cluster_name,$kube_namespace,$kube_daemon_set}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes_state.daemonset.ready{$scope,$kube_cluster_name,$kube_namespace,$kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.daemonset.ready{$scope,$kube_cluster_name,$kube_namespace,$kube_daemon_set}" } ], "formulas": [ @@ -440,8 +430,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.cpu.usage.total{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set} by {kube_cluster_name,kube_namespace,kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.usage.total{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set} by {kube_cluster_name,kube_namespace,kube_daemon_set}" } ], "formulas": [ @@ -489,8 +478,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.memory.usage{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set} by {kube_namespace,kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.usage{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set} by {kube_namespace,kube_daemon_set}" } ], "formulas": [ @@ -540,8 +528,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.memory.usage{$scope,$kube_namespace,$kube_cluster_name,$kube_daemon_set} by {kube_namespace,kube_cluster_name,kube_daemon_set}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -587,8 +574,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.cpu.usage.total{$scope,$kube_namespace,$kube_cluster_name,$kube_daemon_set} by {kube_namespace,kube_cluster_name,kube_daemon_set}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -632,20 +618,17 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.cpu.requests{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.requests{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.cpu.usage.total{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.usage.total{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set}" }, { "data_source": "metrics", "name": "query3", - "query": "sum:kubernetes.cpu.limits{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.limits{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set}" } ], "style": { @@ -687,20 +670,17 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.memory.requests{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.requests{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.memory.rss{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.rss{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set}" }, { "data_source": "metrics", "name": "query3", - "query": "sum:kubernetes.memory.limits{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.limits{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set}" } ], "style": { @@ -818,14 +798,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.rx_bytes{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set} by {kube_namespace,kube_cluster_name,kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.rx_bytes{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set} by {kube_namespace,kube_cluster_name,kube_daemon_set}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.network.tx_bytes{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set} by {kube_namespace,kube_cluster_name,kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.tx_bytes{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set} by {kube_namespace,kube_cluster_name,kube_daemon_set}" } ], "formulas": [ @@ -876,14 +854,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.rx_errors{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set} by {kube_namespace,kube_cluster_name,kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.rx_errors{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set} by {kube_namespace,kube_cluster_name,kube_daemon_set}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.network.tx_errors{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set} by {kube_namespace,kube_cluster_name,kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.tx_errors{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set} by {kube_namespace,kube_cluster_name,kube_daemon_set}" } ], "formulas": [ @@ -940,8 +916,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.filesystem.usage{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set} by {kube_namespace,kube_cluster_name,kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.filesystem.usage{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set} by {kube_namespace,kube_cluster_name,kube_daemon_set}" } ], "formulas": [ @@ -989,8 +964,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.filesystem.usage_pct{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set} by {kube_namespace,kube_cluster_name,kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.filesystem.usage_pct{$kube_namespace,$scope,$kube_cluster_name,$kube_daemon_set} by {kube_namespace,kube_cluster_name,kube_daemon_set}" } ], "formulas": [ @@ -1046,8 +1020,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.filesystem.usage{$scope,$kube_namespace,$kube_cluster_name,$kube_daemon_set} by {kube_namespace,kube_cluster_name,kube_daemon_set}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -1093,8 +1066,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.network.tx_bytes{$scope,$kube_namespace,$kube_cluster_name,$kube_daemon_set} by {kube_namespace,kube_cluster_name,kube_daemon_set}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -1144,8 +1116,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.daemonset.ready{$scope,$kube_cluster_name,$kube_namespace,$kube_daemon_set} by {kube_daemon_set}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -1179,8 +1150,7 @@ "data_source": "metrics", "name": "query1", "query": "max:kubernetes_state.daemonset.desired{$scope,$kube_namespace,$kube_cluster_name,$kube_daemon_set} by {kube_cluster_name}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -1230,8 +1200,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.daemonset.scheduled{$scope,$kube_cluster_name,$kube_namespace,$kube_daemon_set}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -1268,8 +1237,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.daemonset.misscheduled{$scope,$kube_cluster_name,$kube_namespace,$kube_daemon_set}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -1300,8 +1268,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.daemonset.misscheduled{$scope,$kube_cluster_name,$kube_namespace,$kube_daemon_set} by {kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.daemonset.misscheduled{$scope,$kube_cluster_name,$kube_namespace,$kube_daemon_set} by {kube_daemon_set}" } ], "style": { diff --git a/kubernetes/assets/dashboards/kubernetes_dashboard.json b/kubernetes/assets/dashboards/kubernetes_dashboard.json index 492564b928bb2..ee225f0682e7e 100644 --- a/kubernetes/assets/dashboards/kubernetes_dashboard.json +++ b/kubernetes/assets/dashboards/kubernetes_dashboard.json @@ -86,8 +86,7 @@ "data_source": "metrics", "name": "query1", "query": "avg:kubernetes.pods.running{$scope,$label,$node,$service,$deployment,$statefulset,$replicaset,$daemonset,$namespace,$cluster} by {kube_cluster_name}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -122,8 +121,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.node.count{$scope,$label,$node,$service,$namespace,$cluster}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ] } @@ -153,8 +151,7 @@ "data_source": "metrics", "name": "query1", "query": "avg:kubernetes.pods.running{$scope,$label,$node,$service,$deployment,$statefulset,$replicaset,$daemonset,$namespace,$cluster} by {kube_cluster_name,kube_namespace}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -189,8 +186,7 @@ "data_source": "metrics", "name": "query1", "query": "avg:kubernetes_state.daemonset.desired{$scope,$label,$node,$service,$daemonset,$namespace,$cluster} by {kube_cluster_name,kube_namespace,kube_daemon_set}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -225,8 +221,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.service.count{$scope,$label,$node,$service,$namespace,$cluster}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ] } @@ -256,8 +251,7 @@ "data_source": "metrics", "name": "query1", "query": "avg:kubernetes_state.deployment.replicas{$scope,$label,$node,$service,$deployment,$replicaset,$namespace,$cluster} by {kube_cluster_name,kube_namespace,kube_deployment}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -292,8 +286,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.pods.running{$scope,$label,$node,$service,$deployment,$statefulset,$replicaset,$daemonset,$namespace,$cluster}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ] } @@ -328,8 +321,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.containers.running{$scope,$label,$node,$service,$deployment,$statefulset,$replicaset,$daemonset,$namespace,$cluster}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ] } @@ -541,8 +533,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.pod.ready{$scope,$cluster,$namespace,$deployment,$statefulset,$replicaset,$daemonset,condition:true,$label,$node,$service} by {kubernetes_cluster,host,nodepool}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -586,8 +577,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.pods.running{$scope,$deployment,$statefulset,$replicaset,$daemonset,$label,$cluster,$namespace,$service,$node} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.pods.running{$scope,$deployment,$statefulset,$replicaset,$daemonset,$label,$cluster,$namespace,$service,$node} by {host}" } ], "style": { @@ -646,8 +636,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.pods.running{$scope,$namespace,$cluster,$deployment,$statefulset,$replicaset,$daemonset,$label,$node,$service} by {kube_cluster_name,kube_namespace}", - "aggregator": "max", - "semantic_mode": "combined" + "aggregator": "max" } ], "formulas": [ @@ -692,8 +681,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.pods.running{$scope,$cluster,$namespace,$deployment,$statefulset,$replicaset,$daemonset,$label,$node,$service} by {kube_cluster_name,kube_namespace}", - "semantic_mode": "combined" + "query": "sum:kubernetes.pods.running{$scope,$cluster,$namespace,$deployment,$statefulset,$replicaset,$daemonset,$label,$node,$service} by {kube_cluster_name,kube_namespace}" } ], "style": { @@ -752,8 +740,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.pod.status_phase{$scope,$cluster,$namespace,$deployment,$statefulset,$replicaset,$daemonset,!pod_phase:running,!pod_phase:succeeded,$label,$node,$service} by {kube_cluster_name,kube_namespace,pod_phase}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -798,8 +785,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.container.status_report.count.waiting{$cluster,$namespace,$deployment,$statefulset,$replicaset,$daemonset,reason:crashloopbackoff,$scope,$daemonset,$label,$node,$service} by {pod_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.container.status_report.count.waiting{$cluster,$namespace,$deployment,$statefulset,$replicaset,$daemonset,reason:crashloopbackoff,$scope,$daemonset,$label,$node,$service} by {pod_name}" } ], "style": { @@ -881,8 +867,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.daemonset.ready{$scope,$daemonset,$cluster,$label,$namespace,$service,$node}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -914,8 +899,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.daemonset.ready{$scope,$daemonset,$service,$namespace,$label,$cluster,$node} by {kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.daemonset.ready{$scope,$daemonset,$service,$namespace,$label,$cluster,$node} by {kube_daemon_set}" } ], "style": { @@ -961,8 +945,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.daemonset.desired{$scope,$daemonset,$cluster,$label,$namespace,$service,$node}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -994,8 +977,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.daemonset.desired{$scope,$daemonset,$service,$namespace,$label,$cluster,$node} by {kube_daemon_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.daemonset.desired{$scope,$daemonset,$service,$namespace,$label,$cluster,$node} by {kube_daemon_set}" } ], "style": { @@ -1060,8 +1042,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.deployment.replicas_desired{$scope,$deployment,$cluster,$label,$namespace,$service,$node}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ] } @@ -1093,8 +1074,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.deployment.replicas_desired{$scope,$deployment,$cluster,$label,$namespace,$service,$node} by {kube_deployment}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.deployment.replicas_desired{$scope,$deployment,$cluster,$label,$namespace,$service,$node} by {kube_deployment}" } ], "style": { @@ -1139,8 +1119,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.deployment.replicas_available{$scope,$deployment,$cluster,$label,$namespace,$service,$node}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ] } @@ -1172,8 +1151,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.deployment.replicas_available{$scope,$deployment,$service,$label,$cluster,$namespace,$node} by {kube_deployment}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.deployment.replicas_available{$scope,$deployment,$service,$label,$cluster,$namespace,$node} by {kube_deployment}" } ], "style": { @@ -1223,8 +1201,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.deployment.replicas_unavailable{$scope,$deployment,$cluster,$label,$namespace,$service,$node}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ] } @@ -1256,8 +1233,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.deployment.replicas_unavailable{$scope,$deployment,$service,$label,$cluster,$namespace,$node} by {kube_deployment}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.deployment.replicas_unavailable{$scope,$deployment,$service,$label,$cluster,$namespace,$node} by {kube_deployment}" } ], "style": { @@ -1321,8 +1297,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.replicaset.replicas_ready{$scope,$deployment,$replicaset,$cluster,$label,$namespace,$service,$node}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -1354,8 +1329,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.replicaset.replicas_ready{$scope,$service,$namespace,$deployment,$replicaset,$label,$cluster,$node} by {kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.replicaset.replicas_ready{$scope,$service,$namespace,$deployment,$replicaset,$label,$cluster,$node} by {kube_replica_set}" } ], "style": { @@ -1401,15 +1375,13 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.replicaset.replicas_desired{$scope,$deployment,$replicaset,$service,$namespace,$label,$cluster,$node}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" }, { "data_source": "metrics", "name": "query2", "query": "sum:kubernetes_state.replicaset.replicas_ready{$scope,$deployment,$replicaset,$service,$namespace,$label,$cluster,$node}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -1446,14 +1418,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.replicaset.replicas_desired{$scope,$service,$namespace,$deployment,$replicaset,$label,$cluster,$node} by {kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.replicaset.replicas_desired{$scope,$service,$namespace,$deployment,$replicaset,$label,$cluster,$node} by {kube_replica_set}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes_state.replicaset.replicas_ready{$scope,$service,$namespace,$deployment,$replicaset,$label,$cluster,$node} by {kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.replicaset.replicas_ready{$scope,$service,$namespace,$deployment,$replicaset,$label,$cluster,$node} by {kube_replica_set}" } ], "formulas": [ @@ -1524,8 +1494,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.container.running{$scope,$deployment,$statefulset,$replicaset,$daemonset,$service,$namespace,$label,$cluster,$node}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.container.running{$scope,$deployment,$statefulset,$replicaset,$daemonset,$service,$namespace,$label,$cluster,$node}" } ], "response_format": "timeseries", @@ -1547,8 +1516,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.container.status_report.count.waiting{$scope,$deployment,$statefulset,$replicaset,$daemonset,$service,$namespace,$label,$cluster,$node}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.container.status_report.count.waiting{$scope,$deployment,$statefulset,$replicaset,$daemonset,$service,$namespace,$label,$cluster,$node}" } ], "response_format": "timeseries", @@ -1570,8 +1538,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.container.terminated{$scope,$deployment,$statefulset,$replicaset,$daemonset,$service,$namespace,$label,$cluster,$node}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.container.terminated{$scope,$deployment,$statefulset,$replicaset,$daemonset,$service,$namespace,$label,$cluster,$node}" } ], "response_format": "timeseries", @@ -1593,8 +1560,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.container.ready{$scope,$deployment,$statefulset,$replicaset,$daemonset,$service,$namespace,$label,$cluster,$node}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.container.ready{$scope,$deployment,$statefulset,$replicaset,$daemonset,$service,$namespace,$label,$cluster,$node}" } ], "response_format": "timeseries", @@ -1690,8 +1656,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.cpu.requests{$scope,$deployment,$statefulset,$replicaset,$daemonset,$cluster,$namespace,$label,$service,$node} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.requests{$scope,$deployment,$statefulset,$replicaset,$daemonset,$cluster,$namespace,$label,$service,$node} by {host}" } ], "style": { @@ -1727,8 +1692,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.cpu.usage.total{$scope,$deployment,$statefulset,$replicaset,$daemonset,$cluster,$namespace,!pod_name:no_pod,$label,$service,$node} by {pod_name}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -1807,8 +1771,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.memory.requests{$scope,$deployment,$statefulset,$replicaset,$daemonset,$cluster,$namespace,$label,$service,$node} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.requests{$scope,$deployment,$statefulset,$replicaset,$daemonset,$cluster,$namespace,$label,$service,$node} by {host}" } ], "style": { @@ -1844,8 +1807,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.memory.usage{$scope,$deployment,$statefulset,$replicaset,$daemonset,$cluster,$namespace,!pod_name:no_pod,$label,$service,$node} by {pod_name}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -1908,8 +1870,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.rx_bytes{$scope,$deployment,$statefulset,$replicaset,$daemonset,$cluster,$namespace,$label,$service,$node} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.rx_bytes{$scope,$deployment,$statefulset,$replicaset,$daemonset,$cluster,$namespace,$label,$service,$node} by {host}" } ], "style": { @@ -1943,8 +1904,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.tx_bytes{$scope,$deployment,$statefulset,$replicaset,$daemonset,$namespace,$cluster,$label,$service,$node} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.tx_bytes{$scope,$deployment,$statefulset,$replicaset,$daemonset,$namespace,$cluster,$label,$service,$node} by {host}" } ], "style": { @@ -1978,8 +1938,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.rx_errors{$scope,$deployment,$statefulset,$replicaset,$daemonset,$namespace,$cluster,$label,$service,$node} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.rx_errors{$scope,$deployment,$statefulset,$replicaset,$daemonset,$namespace,$cluster,$label,$service,$node} by {host}" } ], "style": { @@ -1993,8 +1952,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.tx_errors{$scope,$deployment,$statefulset,$replicaset,$daemonset,$namespace,$cluster,$label,$service,$node} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.tx_errors{$scope,$deployment,$statefulset,$replicaset,$daemonset,$namespace,$cluster,$label,$service,$node} by {host}" } ], "style": { @@ -2008,8 +1966,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network_errors{$scope,$deployment,$statefulset,$replicaset,$daemonset,$namespace,$cluster,$label,$service,$node} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network_errors{$scope,$deployment,$statefulset,$replicaset,$daemonset,$namespace,$cluster,$label,$service,$node} by {host}" } ], "style": { @@ -2045,8 +2002,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.rx_errors{$scope,$deployment,$statefulset,$replicaset,$daemonset,$namespace,$cluster,$label,$service,$node} by {pod_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.rx_errors{$scope,$deployment,$statefulset,$replicaset,$daemonset,$namespace,$cluster,$label,$service,$node} by {pod_name}" } ], "style": { @@ -2062,8 +2018,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.tx_errors{$scope,$deployment,$statefulset,$replicaset,$daemonset,$namespace,$cluster,$label,$service,$node} by {pod_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.tx_errors{$scope,$deployment,$statefulset,$replicaset,$daemonset,$namespace,$cluster,$label,$service,$node} by {pod_name}" } ], "style": { @@ -2106,8 +2061,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.io.write_bytes{$scope,$service,$namespace,$deployment,$statefulset,$replicaset,$daemonset,$label,$cluster,$node} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.io.write_bytes{$scope,$service,$namespace,$deployment,$statefulset,$replicaset,$daemonset,$label,$cluster,$node} by {host}" } ], "style": { @@ -2143,8 +2097,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.io.read_bytes{$scope,$service,$namespace,$deployment,$statefulset,$replicaset,$daemonset,$label,$cluster,$node} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.io.read_bytes{$scope,$service,$namespace,$deployment,$statefulset,$replicaset,$daemonset,$label,$cluster,$node} by {host}" } ], "style": { diff --git a/kubernetes/assets/dashboards/kubernetes_deployments.json b/kubernetes/assets/dashboards/kubernetes_deployments.json index bb8255f403923..b7f98917383d1 100644 --- a/kubernetes/assets/dashboards/kubernetes_deployments.json +++ b/kubernetes/assets/dashboards/kubernetes_deployments.json @@ -72,8 +72,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.deployment.replicas{$scope,$kube_deployment,$kube_cluster_name,$kube_namespace} by {kube_deployment}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -116,8 +115,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.deployment.replicas{$scope,$kube_deployment,$kube_cluster_name,$kube_namespace}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -155,8 +153,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.deployment.replicas_desired{$scope,$kube_deployment,$kube_cluster_name,$kube_namespace}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -194,8 +191,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.deployment.replicas_available{$scope,$kube_deployment,$kube_cluster_name,$kube_namespace}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -233,8 +229,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.deployment.replicas_updated{$scope,$kube_deployment,$kube_cluster_name,$kube_namespace}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -277,8 +272,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.deployment.replicas_unavailable{$scope,$kube_deployment,$kube_cluster_name,$kube_namespace}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -321,15 +315,13 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.deployment.replicas_desired{$scope,$kube_deployment,$kube_cluster_name,$kube_namespace}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" }, { "data_source": "metrics", "name": "query2", "query": "sum:kubernetes_state.deployment.replicas_available{$scope,$kube_deployment,$kube_cluster_name,$kube_namespace}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -372,15 +364,13 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.deployment.replicas{$scope,$kube_deployment,$kube_cluster_name,$kube_namespace}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" }, { "data_source": "metrics", "name": "query2", "query": "sum:kubernetes_state.deployment.replicas_updated{$scope,$kube_deployment,$kube_cluster_name,$kube_namespace}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -417,8 +407,7 @@ { "data_source": "metrics", "name": "query1", - "query": "avg:kubernetes_state.deployment.replicas{$scope,$kube_deployment,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,kube_namespace,kube_deployment}", - "semantic_mode": "combined" + "query": "avg:kubernetes_state.deployment.replicas{$scope,$kube_deployment,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,kube_namespace,kube_deployment}" } ], "formulas": [ @@ -472,8 +461,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.deployment.replicas{$scope,$kube_deployment,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,kube_namespace,kube_deployment}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.deployment.replicas{$scope,$kube_deployment,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,kube_namespace,kube_deployment}" } ], "style": { @@ -534,8 +522,7 @@ "name": "query1", "data_source": "metrics", "query": "sum:kubernetes_state.deployment.replicas{$scope,$kube_deployment,$kube_namespace,$kube_cluster_name} by {kube_cluster_name,kube_namespace,kube_deployment}", - "aggregator": "sum", - "semantic_mode": "combined" + "aggregator": "sum" } ] } @@ -564,14 +551,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.deployment.replicas_desired{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_deployment}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.deployment.replicas_desired{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_deployment}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes_state.deployment.replicas_available{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_deployment}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.deployment.replicas_available{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_deployment}" } ], "formulas": [ @@ -643,8 +628,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.deployment.replicas{$scope,$kube_deployment,$kube_cluster_name,$kube_namespace} by {kube_deployment}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.deployment.replicas{$scope,$kube_deployment,$kube_cluster_name,$kube_namespace} by {kube_deployment}" } ], "style": { @@ -694,8 +678,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.deployment.replicas_desired{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_deployment}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.deployment.replicas_desired{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_deployment}" } ], "style": { @@ -745,8 +728,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.deployment.replicas_available{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_deployment}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.deployment.replicas_available{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_deployment}" } ], "style": { @@ -789,8 +771,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.deployment.replicas_updated{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_deployment}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.deployment.replicas_updated{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_deployment}" } ], "style": { @@ -846,8 +827,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.deployment.replicas_unavailable{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_cluster_name,kube_namespace,kube_deployment}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.deployment.replicas_unavailable{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_cluster_name,kube_namespace,kube_deployment}" } ], "style": { @@ -897,14 +877,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.deployment.replicas{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_deployment}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.deployment.replicas{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_deployment}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes_state.deployment.replicas_updated{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_deployment}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.deployment.replicas_updated{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_deployment}" } ], "formulas": [ @@ -966,14 +944,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.deployment.replicas_desired{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_deployment,kube_cluster_name,kube_namespace}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.deployment.replicas_desired{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_deployment,kube_cluster_name,kube_namespace}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes_state.deployment.replicas_available{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_deployment,kube_cluster_name,kube_namespace}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.deployment.replicas_available{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_deployment,kube_cluster_name,kube_namespace}" } ], "formulas": [ @@ -1021,8 +997,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.deployment.rollingupdate.max_unavailable{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_deployment}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.deployment.rollingupdate.max_unavailable{$scope,$kube_cluster_name,$kube_namespace,$kube_deployment} by {kube_deployment}" } ], "style": { @@ -1083,8 +1058,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.cpu.usage.total{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name} by {kube_cluster_name,kube_namespace,kube_deployment}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.usage.total{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name} by {kube_cluster_name,kube_namespace,kube_deployment}" } ], "formulas": [ @@ -1140,8 +1114,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.cpu.usage.total{$scope,$kube_namespace,$kube_deployment,!pod_name:no_pod,$kube_cluster_name} by {kube_deployment,kube_namespace,kube_cluster_name}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -1186,20 +1159,17 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.cpu.requests{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.requests{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.cpu.usage.total{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.usage.total{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name}" }, { "data_source": "metrics", "name": "query3", - "query": "sum:kubernetes.cpu.limits{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.limits{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name}" } ], "formulas": [ @@ -1281,8 +1251,7 @@ { "data_source": "metrics", "name": "query1", - "query": "avg:kubernetes.memory.usage{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name} by {kube_deployment,kube_namespace,kube_cluster_name}", - "semantic_mode": "combined" + "query": "avg:kubernetes.memory.usage{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name} by {kube_deployment,kube_namespace,kube_cluster_name}" } ], "formulas": [ @@ -1338,8 +1307,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.memory.usage{$scope,$kube_namespace,$kube_deployment,!pod_name:no_pod,$kube_cluster_name} by {kube_deployment,kube_namespace,kube_cluster_name}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -1384,20 +1352,17 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.memory.requests{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.requests{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.memory.rss{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.rss{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name}" }, { "data_source": "metrics", "name": "query3", - "query": "sum:kubernetes.memory.limits{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.limits{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name}" } ], "formulas": [ @@ -1485,8 +1450,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.filesystem.usage{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name} by {kube_deployment,kube_namespace,kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.filesystem.usage{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name} by {kube_deployment,kube_namespace,kube_cluster_name}" } ], "style": { @@ -1542,8 +1506,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.filesystem.usage_pct{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name} by {kube_deployment,kube_namespace,kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.filesystem.usage_pct{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name} by {kube_deployment,kube_namespace,kube_cluster_name}" } ], "formulas": [ @@ -1612,8 +1575,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.filesystem.usage{$scope,$kube_namespace,$kube_deployment,!pod_name:no_pod,$kube_cluster_name} by {kube_deployment,kube_namespace,kube_cluster_name}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -1676,14 +1638,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.rx_bytes{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name} by {kube_deployment,kube_namespace,kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.rx_bytes{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name} by {kube_deployment,kube_namespace,kube_cluster_name}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.network.tx_bytes{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name} by {kube_deployment,kube_namespace,kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.tx_bytes{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name} by {kube_deployment,kube_namespace,kube_cluster_name}" } ], "style": { @@ -1726,14 +1686,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.rx_errors{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name} by {kube_deployment,kube_namespace,kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.rx_errors{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name} by {kube_deployment,kube_namespace,kube_cluster_name}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.network.tx_errors{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name} by {kube_deployment,kube_namespace,kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.tx_errors{$kube_namespace,$kube_deployment,$scope,$kube_cluster_name} by {kube_deployment,kube_namespace,kube_cluster_name}" } ], "style": { @@ -1791,8 +1749,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.network.tx_bytes{$scope,$kube_namespace,$kube_deployment,!pod_name:no_pod,$kube_cluster_name} by {kube_deployment,kube_namespace,kube_cluster_name}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ diff --git a/kubernetes/assets/dashboards/kubernetes_jobs.json b/kubernetes/assets/dashboards/kubernetes_jobs.json index b3beadeaeff35..751fa4e7856bd 100644 --- a/kubernetes/assets/dashboards/kubernetes_jobs.json +++ b/kubernetes/assets/dashboards/kubernetes_jobs.json @@ -32,8 +32,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.job.count{$kube_cluster_name}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -76,8 +75,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.job.count{$kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.job.count{$kube_cluster_name}" } ], "response_format": "timeseries", @@ -127,8 +125,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.job.succeeded{$kube_cluster_name}.as_count()", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ] } @@ -173,8 +170,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.job.succeeded{$kube_cluster_name}.as_count()", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.job.succeeded{$kube_cluster_name}.as_count()" } ], "response_format": "timeseries", @@ -224,8 +220,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.job.failed{$kube_cluster_name}.as_count()", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ] } @@ -270,8 +265,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.job.failed{$kube_cluster_name}.as_count()", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.job.failed{$kube_cluster_name}.as_count()" } ], "response_format": "timeseries", @@ -335,20 +329,17 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.cpu.requests{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.requests{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job}" }, { "data_source": "metrics", "name": "query3", - "query": "sum:kubernetes.cpu.limits{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.limits{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.cpu.usage.total{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.usage.total{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job}" } ], "response_format": "timeseries", @@ -412,20 +403,17 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.memory.requests{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.requests{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.memory.rss{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.rss{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job}" }, { "data_source": "metrics", "name": "query3", - "query": "sum:kubernetes.memory.limits{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.limits{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job}" } ], "response_format": "timeseries", @@ -468,22 +456,19 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.job.count{$kube_cluster_name} by {kube_cluster_name}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "data_source": "metrics", "name": "query2", "query": "sum:kubernetes_state.job.succeeded{$kube_cluster_name} by {kube_cluster_name}.as_count()", - "aggregator": "sum", - "semantic_mode": "combined" + "aggregator": "sum" }, { "data_source": "metrics", "name": "query3", "query": "sum:kubernetes_state.job.failed{$kube_cluster_name} by {kube_cluster_name}.as_count()", - "aggregator": "sum", - "semantic_mode": "combined" + "aggregator": "sum" } ], "sort": { @@ -548,8 +533,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.job.count{$kube_cluster_name} by {kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.job.count{$kube_cluster_name} by {kube_cluster_name}" } ], "response_format": "timeseries", @@ -592,15 +576,13 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.job.count{$kube_cluster_name} by {kube_cronjob}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" }, { "data_source": "metrics", "name": "query2", "query": "sum:kubernetes_state.job.count{$kube_cluster_name} by {kube_cronjob}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "sort": { @@ -661,8 +643,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.job.count{$kube_cluster_name} by {kube_cronjob}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.job.count{$kube_cluster_name} by {kube_cronjob}" } ], "response_format": "timeseries", @@ -722,43 +703,37 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.cpu.usage.total{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_job}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "data_source": "metrics", "name": "query2", "query": "sum:kubernetes.memory.usage{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_job}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "data_source": "metrics", "name": "query3", "query": "sum:kubernetes.network.rx_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_job}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "data_source": "metrics", "name": "query4", "query": "sum:kubernetes.network.tx_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_job}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "data_source": "metrics", "name": "query5", "query": "sum:kubernetes.io.read_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_job}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "data_source": "metrics", "name": "query6", "query": "sum:kubernetes.io.write_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_job}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "sort": { @@ -841,8 +816,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.cpu.usage.total{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_job}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.usage.total{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_job}" } ], "response_format": "timeseries", @@ -894,8 +868,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.memory.usage{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_job}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.usage{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_job}" } ], "response_format": "timeseries", @@ -952,8 +925,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.io.read_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_namespace,kube_cluster_name,kube_job}", - "semantic_mode": "combined" + "query": "sum:kubernetes.io.read_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_namespace,kube_cluster_name,kube_job}" } ], "response_format": "timeseries", @@ -976,8 +948,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.io.write_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_namespace,kube_cluster_name,kube_job}", - "semantic_mode": "combined" + "query": "sum:kubernetes.io.write_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_namespace,kube_cluster_name,kube_job}" } ], "response_format": "timeseries", @@ -1034,8 +1005,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.rx_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_namespace,kube_cluster_name,kube_job}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.rx_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_namespace,kube_cluster_name,kube_job}" } ], "response_format": "timeseries", @@ -1058,8 +1028,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.tx_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_namespace,kube_cluster_name,kube_job}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.tx_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_namespace,kube_cluster_name,kube_job}" } ], "response_format": "timeseries", @@ -1120,14 +1089,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.rx_errors{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_job}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.rx_errors{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_job}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.network.tx_errors{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_job}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.tx_errors{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_job}" } ], "response_format": "timeseries", @@ -1194,43 +1161,37 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.cpu.usage.total{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_cronjob}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "data_source": "metrics", "name": "query2", "query": "sum:kubernetes.memory.usage{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_cronjob}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "data_source": "metrics", "name": "query3", "query": "sum:kubernetes.network.rx_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_cronjob}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "data_source": "metrics", "name": "query4", "query": "sum:kubernetes.network.tx_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_cronjob}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "data_source": "metrics", "name": "query5", "query": "sum:kubernetes.io.read_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_cronjob}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" }, { "data_source": "metrics", "name": "query6", "query": "sum:kubernetes.io.write_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_cronjob}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "sort": { @@ -1313,8 +1274,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.cpu.usage.total{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_cronjob}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.usage.total{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_cronjob}" } ], "response_format": "timeseries", @@ -1366,8 +1326,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.memory.usage{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_cronjob}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.usage{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_cronjob}" } ], "response_format": "timeseries", @@ -1424,8 +1383,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.io.read_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_namespace,kube_cluster_name,kube_cronjob}", - "semantic_mode": "combined" + "query": "sum:kubernetes.io.read_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_namespace,kube_cluster_name,kube_cronjob}" } ], "response_format": "timeseries", @@ -1448,8 +1406,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.io.write_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_namespace,kube_cluster_name,kube_cronjob}", - "semantic_mode": "combined" + "query": "sum:kubernetes.io.write_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_namespace,kube_cluster_name,kube_cronjob}" } ], "response_format": "timeseries", @@ -1506,8 +1463,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.rx_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_namespace,kube_cluster_name,kube_cronjob}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.rx_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_namespace,kube_cluster_name,kube_cronjob}" } ], "response_format": "timeseries", @@ -1530,8 +1486,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.tx_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_namespace,kube_cluster_name,kube_cronjob}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.tx_bytes{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_namespace,kube_cluster_name,kube_cronjob}" } ], "response_format": "timeseries", @@ -1592,14 +1547,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.rx_errors{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_cronjob}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.rx_errors{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_cronjob}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.network.tx_errors{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_cronjob}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.tx_errors{$kube_cluster_name,$kube_namespace,$kube_cronjob,$kube_job} by {kube_cluster_name,kube_namespace,kube_cronjob}" } ], "response_format": "timeseries", diff --git a/kubernetes/assets/dashboards/kubernetes_nodes.json b/kubernetes/assets/dashboards/kubernetes_nodes.json index 401c3ea558c25..d5ce21047ea29 100644 --- a/kubernetes/assets/dashboards/kubernetes_nodes.json +++ b/kubernetes/assets/dashboards/kubernetes_nodes.json @@ -33,8 +33,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.node.count{$cluster,$host}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ] } @@ -72,8 +71,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.node.cpu_capacity{$cluster,$host}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ] } @@ -110,8 +108,7 @@ { "data_source": "metrics", "name": "query1", - "query": "avg:system.mem.pct_usable{$cluster,$host} by {host}", - "semantic_mode": "combined" + "query": "avg:system.mem.pct_usable{$cluster,$host} by {host}" } ], "response_format": "timeseries", @@ -174,8 +171,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.node.by_condition{$cluster,status:false,$host,condition:ready}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ] } @@ -212,8 +208,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.node.memory_capacity{$cluster,$host}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ] } @@ -245,8 +240,7 @@ { "data_source": "metrics", "name": "query1", - "query": "avg:system.cpu.idle{$host,$cluster} by {host}", - "semantic_mode": "combined" + "query": "avg:system.cpu.idle{$host,$cluster} by {host}" } ], "formulas": [ @@ -373,8 +367,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.node.by_condition{$cluster,status:true,$host} by {condition}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -426,8 +419,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.node.by_condition{$cluster,$host,condition:ready,status:true} by {condition,status,kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.node.by_condition{$cluster,$host,condition:ready,status:true} by {condition,status,kube_cluster_name}" } ], "style": { @@ -477,13 +469,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.node.by_condition{$cluster,status:false,$host,condition:ready} by {kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.node.by_condition{$cluster,status:false,$host,condition:ready} by {kube_cluster_name}" } ], "formulas": [ { - "formula": "top(query1, 10, 'last', 'desc')" + "formula": "top(query1, 10, \"last\", \"desc\")" } ], "style": { @@ -551,8 +542,7 @@ { "data_source": "metrics", "name": "query1", - "query": "avg:system.cpu.idle{$host,$cluster} by {host}", - "semantic_mode": "combined" + "query": "avg:system.cpu.idle{$host,$cluster} by {host}" } ], "formulas": [ @@ -611,8 +601,7 @@ { "data_source": "metrics", "name": "query1", - "query": "avg:system.mem.pct_usable{$cluster,$host} by {host}", - "semantic_mode": "combined" + "query": "avg:system.mem.pct_usable{$cluster,$host} by {host}" } ], "response_format": "timeseries", @@ -657,8 +646,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.cpu.usage.total{$cluster,$host} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.usage.total{$cluster,$host} by {host}" } ], "style": { @@ -700,8 +688,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.memory.usage{$cluster,$host} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.usage{$cluster,$host} by {host}" } ], "style": { @@ -751,8 +738,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.cpu.requests{$cluster,$host} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.requests{$cluster,$host} by {host}" } ], "style": { @@ -802,8 +788,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.memory.requests{$cluster,$host} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.requests{$cluster,$host} by {host}" } ], "style": { @@ -863,14 +848,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.container.cpu_requested{$cluster,$host} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.container.cpu_requested{$cluster,$host} by {host}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes_state.node.cpu_capacity{$cluster,$host} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.node.cpu_capacity{$cluster,$host} by {host}" } ], "response_format": "timeseries", @@ -945,14 +928,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.container.cpu_requested{$cluster,$host} by {kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.container.cpu_requested{$cluster,$host} by {kube_cluster_name}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes_state.node.cpu_capacity{$cluster,$host} by {kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.node.cpu_capacity{$cluster,$host} by {kube_cluster_name}" } ], "formulas": [ @@ -1038,8 +1019,7 @@ { "data_source": "metrics", "name": "query1", - "query": "avg:kubernetes.node.filesystem.usage_pct{$cluster,$host} by {kube_cluster_name}", - "semantic_mode": "combined" + "query": "avg:kubernetes.node.filesystem.usage_pct{$cluster,$host} by {kube_cluster_name}" } ], "response_format": "timeseries", @@ -1090,8 +1070,7 @@ { "data_source": "metrics", "name": "query1", - "query": "avg:kubernetes.memory.usage_pct{$cluster,$host} by {kube_cluster_name}", - "semantic_mode": "combined" + "query": "avg:kubernetes.memory.usage_pct{$cluster,$host} by {kube_cluster_name}" } ], "formulas": [ @@ -1166,8 +1145,7 @@ { "data_source": "metrics", "name": "query1", - "query": "avg:system.cpu.idle{$host,$cluster} by {kube_cluster_name}", - "semantic_mode": "combined" + "query": "avg:system.cpu.idle{$host,$cluster} by {kube_cluster_name}" } ], "formulas": [ @@ -1244,8 +1222,7 @@ { "data_source": "metrics", "name": "query1", - "query": "avg:kubernetes_state.node.memory_allocatable{$cluster,$host} by {host}", - "semantic_mode": "combined" + "query": "avg:kubernetes_state.node.memory_allocatable{$cluster,$host} by {host}" } ], "style": { @@ -1295,13 +1272,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.pods.running{$cluster,$host} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.pods.running{$cluster,$host} by {host}" } ], "formulas": [ { - "formula": "top(query1, 50, 'mean', 'desc')" + "formula": "top(query1, 50, \"mean\", \"desc\")" } ], "style": { @@ -1343,8 +1319,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.pod.ready{$cluster,condition:true,$host} by {host,pod_name}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -1396,8 +1371,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.containers.running{$cluster,$host} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.containers.running{$cluster,$host} by {host}" } ], "style": { @@ -1551,8 +1525,7 @@ "data_source": "metrics", "name": "query1", "query": "max:tls.seconds_left{kubelet:server,$cluster,$host} by {host}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -1634,8 +1607,7 @@ { "data_source": "metrics", "name": "query1", - "query": "avg:kubernetes_state.node.pods_allocatable{$cluster,$host} by {host}", - "semantic_mode": "combined" + "query": "avg:kubernetes_state.node.pods_allocatable{$cluster,$host} by {host}" } ], "style": { @@ -1685,8 +1657,7 @@ { "data_source": "metrics", "name": "query1", - "query": "avg:kubernetes_state.node.cpu_allocatable{$cluster,$host} by {host}", - "semantic_mode": "combined" + "query": "avg:kubernetes_state.node.cpu_allocatable{$cluster,$host} by {host}" } ], "style": { @@ -1728,8 +1699,7 @@ "data_source": "metrics", "name": "query1", "query": "avg:kubernetes_state.node.cpu_allocatable{$host, $cluster} by {host}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "sort": { @@ -1774,8 +1744,7 @@ "data_source": "metrics", "name": "query1", "query": "avg:kubernetes_state.node.pods_allocatable{$cluster,$host} by {host}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "sort": { @@ -1820,8 +1789,7 @@ "data_source": "metrics", "name": "query1", "query": "avg:kubernetes_state.node.memory_allocatable{$cluster,$host} by {host}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "sort": { @@ -1885,8 +1853,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.rx_bytes{$cluster,$host} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.rx_bytes{$cluster,$host} by {host}" } ], "style": { @@ -1929,8 +1896,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.io.read_bytes{$cluster,$host} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.io.read_bytes{$cluster,$host} by {host}" } ], "style": { @@ -1973,8 +1939,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.tx_bytes{$cluster,$host} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.tx_bytes{$cluster,$host} by {host}" } ], "style": { @@ -2017,8 +1982,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.io.write_bytes{$cluster,$host} by {host}", - "semantic_mode": "combined" + "query": "sum:kubernetes.io.write_bytes{$cluster,$host} by {host}" } ], "style": { diff --git a/kubernetes/assets/dashboards/kubernetes_pods.json b/kubernetes/assets/dashboards/kubernetes_pods.json index 2cba84ef88eef..6b14a26b1433d 100644 --- a/kubernetes/assets/dashboards/kubernetes_pods.json +++ b/kubernetes/assets/dashboards/kubernetes_pods.json @@ -81,8 +81,7 @@ { "query": "sum:kubernetes.pods.running{$scope,$cluster,$namespace,$deployment,$statefulset,$daemonset,$job,$cronjob}", "data_source": "metrics", - "name": "query1", - "semantic_mode": "combined" + "name": "query1" } ], "style": { @@ -137,8 +136,7 @@ "name": "query1", "data_source": "metrics", "query": "sum:kubernetes.pods.running{$scope,$namespace,$cluster,$deployment,$statefulset,$daemonset,$job} by {kube_namespace,kube_deployment}", - "aggregator": "sum", - "semantic_mode": "combined" + "aggregator": "sum" } ] } @@ -173,8 +171,7 @@ "query": "sum:kubernetes_state.pod.status_phase{$scope,$cluster,$namespace,$deployment,$statefulset,$daemonset,$job,$cronjob,!pod_phase:running,!pod_phase:succeeded} by {pod_phase,kube_namespace}", "data_source": "metrics", "name": "query1", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -229,8 +226,7 @@ { "query": "sum:kubernetes.pods.running{$scope,$cluster,$namespace,$deployment,$statefulset,$daemonset,$job} by {kube_cluster_name,kube_namespace}", "data_source": "metrics", - "name": "query1", - "semantic_mode": "combined" + "name": "query1" } ], "style": { @@ -290,8 +286,7 @@ "query": "sum:kubernetes.cpu.usage.total{$scope,$namespace,$deployment,!pod_name:no_pod,$cluster,$statefulset,$daemonset,$job} by {pod_name}", "data_source": "metrics", "name": "query1", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -347,8 +342,7 @@ { "query": "sum:kubernetes.cpu.usage.total{$cluster,$namespace,$deployment,$scope,$statefulset,$daemonset,$job} by {pod_name}", "data_source": "metrics", - "name": "query1", - "semantic_mode": "combined" + "name": "query1" } ], "style": { @@ -390,8 +384,7 @@ "query": "sum:kubernetes.memory.usage{$scope,$namespace,$deployment,!pod_name:no_pod,$cluster,$statefulset,$daemonset,$job} by {pod_name}", "data_source": "metrics", "name": "query1", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -447,8 +440,7 @@ { "query": "sum:kubernetes.memory.usage{$cluster,$namespace,$deployment,$scope,$statefulset,$daemonset,$job} by {pod_name}", "data_source": "metrics", - "name": "query1", - "semantic_mode": "combined" + "name": "query1" } ], "style": { @@ -507,8 +499,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.pods.running{$scope,$namespace,$deployment,$cluster,$statefulset,$daemonset,$job} by {kube_cluster_name,kube_namespace}", - "aggregator": "max", - "semantic_mode": "combined" + "aggregator": "max" } ], "formulas": [ @@ -569,8 +560,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.pod.ready{$scope,$cluster,$namespace,$deployment,condition:true,$statefulset,$daemonset,$job} by {kube_cluster_name,host,nodepool}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -626,8 +616,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.pod.ready{condition:false,$scope,$cluster,$namespace,$deployment,$statefulset,$daemonset,$job,!pod_phase:succeeded} by {kube_namespace}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -688,8 +677,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.pods.running{$scope,$namespace,$deployment,$cluster,$statefulset,$daemonset,$job} by {kube_runtime_class}", - "aggregator": "max", - "semantic_mode": "combined" + "aggregator": "max" } ], "formulas": [ @@ -759,26 +747,22 @@ { "query": "sum:kubernetes_state.pod.status_phase{$cluster,$namespace,$deployment,pod_phase:failed,$scope,$statefulset,$daemonset,$job}", "data_source": "metrics", - "name": "query1", - "semantic_mode": "combined" + "name": "query1" }, { "query": "sum:kubernetes_state.pod.status_phase{$cluster,$namespace,$deployment,pod_phase:pending,$scope,$statefulset,$daemonset,$job}", "data_source": "metrics", - "name": "query2", - "semantic_mode": "combined" + "name": "query2" }, { "query": "sum:kubernetes_state.pod.status_phase{$cluster,$namespace,$deployment,pod_phase:running,$scope,$statefulset,$daemonset,$job}", "data_source": "metrics", - "name": "query3", - "semantic_mode": "combined" + "name": "query3" }, { "query": "sum:kubernetes_state.pod.status_phase{$cluster,$namespace,$deployment,pod_phase:succeeded,$scope,$statefulset,$daemonset,$job}", "data_source": "metrics", - "name": "query4", - "semantic_mode": "combined" + "name": "query4" } ], "style": { @@ -865,26 +849,22 @@ { "query": "sum:kubernetes_state.container.ready{$cluster,$namespace,$deployment,$scope,$statefulset,$daemonset,$job}", "data_source": "metrics", - "name": "query1", - "semantic_mode": "combined" + "name": "query1" }, { "query": "sum:kubernetes_state.container.running{$cluster,$namespace,$deployment,$scope,$statefulset,$daemonset,$job}", "data_source": "metrics", - "name": "query2", - "semantic_mode": "combined" + "name": "query2" }, { "query": "sum:kubernetes_state.container.terminated{$cluster,$namespace,$deployment,$scope,$statefulset,$daemonset,$job}", "data_source": "metrics", - "name": "query3", - "semantic_mode": "combined" + "name": "query3" }, { "query": "sum:kubernetes_state.container.status_report.count.waiting{$cluster,$namespace,$deployment,$scope,$statefulset,$daemonset,$job}", "data_source": "metrics", - "name": "query4", - "semantic_mode": "combined" + "name": "query4" } ], "style": { @@ -935,8 +915,7 @@ { "query": "sum:kubernetes.containers.state.terminated{$cluster,$namespace,$deployment,reason:oomkilled,$scope,$statefulset,$daemonset,$job} by {pod_name}", "data_source": "metrics", - "name": "query1", - "semantic_mode": "combined" + "name": "query1" } ], "style": { @@ -991,8 +970,7 @@ { "query": "sum:kubernetes_state.container.status_report.count.waiting{$cluster,$namespace,$deployment,reason:crashloopbackoff,$scope,$statefulset,$daemonset,$job} by {pod_name}", "data_source": "metrics", - "name": "query1", - "semantic_mode": "combined" + "name": "query1" } ], "style": { @@ -1049,8 +1027,7 @@ { "query": "sum:kubernetes_state.container.restarts{$scope,$cluster,$namespace,$deployment,$statefulset,$daemonset,$job} by {pod_name}", "data_source": "metrics", - "name": "query1", - "semantic_mode": "combined" + "name": "query1" } ], "style": { @@ -1105,8 +1082,7 @@ { "query": "sum:kubernetes.cpu.usage.total{$cluster,$namespace,$deployment,$scope,$statefulset,$daemonset,$job} by {kube_container_name,container_id}", "data_source": "metrics", - "name": "query1", - "semantic_mode": "combined" + "name": "query1" } ], "style": { @@ -1161,8 +1137,7 @@ { "query": "sum:kubernetes.memory.usage{$cluster,$namespace,$deployment,$scope,$statefulset,$daemonset,$job} by {kube_container_name,container_id}", "data_source": "metrics", - "name": "query1", - "semantic_mode": "combined" + "name": "query1" } ], "style": { @@ -1221,14 +1196,12 @@ { "query": "sum:kubernetes.network.rx_bytes{$cluster,$namespace,$deployment,$scope,$statefulset,$daemonset,$job} by {pod_name}", "data_source": "metrics", - "name": "query1", - "semantic_mode": "combined" + "name": "query1" }, { "query": "sum:kubernetes.network.tx_bytes{$cluster,$namespace,$deployment,$scope,$statefulset,$daemonset,$job} by {pod_name}", "data_source": "metrics", - "name": "query2", - "semantic_mode": "combined" + "name": "query2" } ], "style": { @@ -1287,14 +1260,12 @@ { "query": "sum:kubernetes.network.rx_errors{$cluster,$namespace,$deployment,$scope,$statefulset,$daemonset,$job} by {pod_name}", "data_source": "metrics", - "name": "query1", - "semantic_mode": "combined" + "name": "query1" }, { "query": "sum:kubernetes.network.tx_errors{$cluster,$namespace,$deployment,$scope,$statefulset,$daemonset,$job} by {pod_name}", "data_source": "metrics", - "name": "query2", - "semantic_mode": "combined" + "name": "query2" } ], "style": { diff --git a/kubernetes/assets/dashboards/kubernetes_replicasets.json b/kubernetes/assets/dashboards/kubernetes_replicasets.json index b3c8f511a30d2..2cb8253c91608 100644 --- a/kubernetes/assets/dashboards/kubernetes_replicasets.json +++ b/kubernetes/assets/dashboards/kubernetes_replicasets.json @@ -30,8 +30,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.replicaset.replicas_ready{$scope,$kube_cluster_name,$kube_namespace,$kube_replica_set}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -62,8 +61,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.replicaset.replicas_ready{$scope,$kube_cluster_name,$kube_namespace,$kube_replica_set} by {kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.replicaset.replicas_ready{$scope,$kube_cluster_name,$kube_namespace,$kube_replica_set} by {kube_replica_set}" } ], "style": { @@ -112,8 +110,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.replicaset.replicas{$scope,$kube_cluster_name,$kube_namespace,$kube_replica_set}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -144,8 +141,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.replicaset.replicas{$scope,$kube_cluster_name,$kube_namespace,$kube_replica_set} by {kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.replicaset.replicas{$scope,$kube_cluster_name,$kube_namespace,$kube_replica_set} by {kube_replica_set}" } ], "style": { @@ -193,8 +189,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.replicaset.replicas_desired{$scope,$kube_cluster_name,$kube_namespace,$kube_replica_set}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -225,8 +220,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.replicaset.replicas_desired{$scope,$kube_cluster_name,$kube_namespace,$kube_replica_set} by {kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.replicaset.replicas_desired{$scope,$kube_cluster_name,$kube_namespace,$kube_replica_set} by {kube_replica_set}" } ], "style": { @@ -268,14 +262,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.replicaset.replicas_desired{$scope,$kube_cluster_name,$kube_namespace,$kube_replica_set} by {kube_cluster_name,kube_namespace,kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.replicaset.replicas_desired{$scope,$kube_cluster_name,$kube_namespace,$kube_replica_set} by {kube_cluster_name,kube_namespace,kube_replica_set}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes_state.replicaset.replicas_ready{$scope,$kube_cluster_name,$kube_namespace,$kube_replica_set} by {kube_cluster_name,kube_namespace,kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.replicaset.replicas_ready{$scope,$kube_cluster_name,$kube_namespace,$kube_replica_set} by {kube_cluster_name,kube_namespace,kube_replica_set}" } ], "formulas": [ @@ -341,8 +333,7 @@ { "data_source": "metrics", "name": "query1", - "query": "avg:kubernetes_state.replicaset.replicas{$scope,$kube_namespace,$kube_cluster_name,$kube_replica_set} by {kube_cluster_name,kube_namespace,kube_replica_set}", - "semantic_mode": "combined" + "query": "avg:kubernetes_state.replicaset.replicas{$scope,$kube_namespace,$kube_cluster_name,$kube_replica_set} by {kube_cluster_name,kube_namespace,kube_replica_set}" } ], "formulas": [ @@ -389,8 +380,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.replicaset.replicas_ready{$scope,$kube_namespace,$kube_cluster_name,$kube_replica_set} by {kube_cluster_name,kube_namespace,kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.replicaset.replicas_ready{$scope,$kube_namespace,$kube_cluster_name,$kube_replica_set} by {kube_cluster_name,kube_namespace,kube_replica_set}" } ], "style": { @@ -443,8 +433,7 @@ "name": "query1", "data_source": "metrics", "query": "top(avg:kubernetes_state.replicaset.replicas{$scope,$kube_namespace,$kube_cluster_name,$kube_replica_set} by {kube_cluster_name,kube_namespace,kube_replica_set}, 10, 'mean', 'desc')", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ] } @@ -473,14 +462,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.replicaset.replicas_desired{$scope,$kube_cluster_name,$kube_namespace,$kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.replicaset.replicas_desired{$scope,$kube_cluster_name,$kube_namespace,$kube_replica_set}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes_state.replicaset.replicas_ready{$scope,$kube_cluster_name,$kube_namespace,$kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.replicaset.replicas_ready{$scope,$kube_cluster_name,$kube_namespace,$kube_replica_set}" } ], "formulas": [ @@ -565,8 +552,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.cpu.usage.total{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set} by {kube_cluster_name,kube_namespace,kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.usage.total{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set} by {kube_cluster_name,kube_namespace,kube_replica_set}" } ], "formulas": [ @@ -613,8 +599,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.memory.usage{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set} by {kube_deployment,kube_namespace,kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.usage{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set} by {kube_deployment,kube_namespace,kube_replica_set}" } ], "formulas": [ @@ -663,8 +648,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.memory.usage{$scope,$kube_namespace,$kube_cluster_name,$kube_replica_set,!pod_name:no_pod} by {kube_namespace,kube_cluster_name,kube_replica_set}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -710,8 +694,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.cpu.usage.total{$scope,$kube_namespace,$kube_cluster_name,$kube_replica_set,!pod_name:no_pod} by {kube_namespace,kube_cluster_name,kube_replica_set}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -755,20 +738,17 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.cpu.requests{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.requests{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.cpu.usage.total{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.usage.total{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set}" }, { "data_source": "metrics", "name": "query3", - "query": "sum:kubernetes.cpu.limits{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.limits{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set}" } ], "style": { @@ -810,20 +790,17 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.memory.requests{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.requests{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.memory.rss{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.rss{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set}" }, { "data_source": "metrics", "name": "query3", - "query": "sum:kubernetes.memory.limits{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.limits{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set}" } ], "style": { @@ -941,14 +918,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.rx_bytes{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set} by {kube_namespace,kube_cluster_name,kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.rx_bytes{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set} by {kube_namespace,kube_cluster_name,kube_replica_set}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.network.tx_bytes{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set} by {kube_namespace,kube_cluster_name,kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.tx_bytes{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set} by {kube_namespace,kube_cluster_name,kube_replica_set}" } ], "formulas": [ @@ -998,14 +973,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.rx_errors{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set} by {kube_namespace,kube_cluster_name,kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.rx_errors{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set} by {kube_namespace,kube_cluster_name,kube_replica_set}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.network.tx_errors{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set} by {kube_namespace,kube_cluster_name,kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.tx_errors{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set} by {kube_namespace,kube_cluster_name,kube_replica_set}" } ], "formulas": [ @@ -1062,8 +1035,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.filesystem.usage{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set} by {kube_namespace,kube_cluster_name,kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.filesystem.usage{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set} by {kube_namespace,kube_cluster_name,kube_replica_set}" } ], "formulas": [ @@ -1110,8 +1082,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.filesystem.usage_pct{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set} by {kube_namespace,kube_cluster_name,kube_replica_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.filesystem.usage_pct{$kube_namespace,$scope,$kube_cluster_name,$kube_replica_set} by {kube_namespace,kube_cluster_name,kube_replica_set}" } ], "formulas": [ @@ -1167,8 +1138,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.filesystem.usage{$scope,$kube_namespace,$kube_cluster_name,$kube_replica_set,!pod_name:no_pod} by {kube_namespace,kube_cluster_name,kube_replica_set}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -1214,8 +1184,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.network.tx_bytes{$scope,$kube_namespace,$kube_cluster_name,$kube_replica_set,!pod_name:no_pod} by {kube_namespace,kube_cluster_name,kube_replica_set}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -1265,8 +1234,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.replicaset.replicas{$scope,$kube_cluster_name,$kube_namespace,$kube_replica_set} by {kube_replica_set}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ], "formulas": [ @@ -1301,8 +1269,7 @@ { "data_source": "metrics", "name": "query1", - "query": "avg:kubernetes_state.replicaset.replicas{$scope,$kube_namespace,$kube_cluster_name,$kube_replica_set} by {kube_cluster_name,kube_namespace,kube_replica_set}", - "semantic_mode": "combined" + "query": "avg:kubernetes_state.replicaset.replicas{$scope,$kube_namespace,$kube_cluster_name,$kube_replica_set} by {kube_cluster_name,kube_namespace,kube_replica_set}" } ], "formulas": [ @@ -1348,8 +1315,7 @@ "data_source": "metrics", "name": "query1", "query": "avg:kubernetes_state.replicaset.replicas{$scope,$kube_namespace,$kube_cluster_name,$kube_replica_set} by {kube_cluster_name,kube_namespace,kube_replica_set}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ diff --git a/kubernetes/assets/dashboards/kubernetes_services.json b/kubernetes/assets/dashboards/kubernetes_services.json index f1bd77f2f60b2..d317da25137cc 100644 --- a/kubernetes/assets/dashboards/kubernetes_services.json +++ b/kubernetes/assets/dashboards/kubernetes_services.json @@ -44,8 +44,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.service.count{$scope,$kube_cluster_name} by {type}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.service.count{$scope,$kube_cluster_name} by {type}" } ], "style": { @@ -106,8 +105,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.cpu.usage.total{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.usage.total{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}" } ], "formulas": [ @@ -154,8 +152,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.memory.usage{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.usage{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}" } ], "formulas": [ @@ -204,8 +201,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.memory.usage{$scope,$kube_namespace,$kube_service,$kube_cluster_name,!pod_name:no_pod} by {kube_service,kube_namespace,kube_cluster_name}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -251,8 +247,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.cpu.usage.total{$scope,$kube_namespace,$kube_service,$kube_cluster_name,!pod_name:no_pod} by {kube_service,kube_namespace,kube_cluster_name}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -372,14 +367,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.rx_bytes{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.rx_bytes{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.network.tx_bytes{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.tx_bytes{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}" } ], "formulas": [ @@ -429,14 +422,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.rx_errors{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.rx_errors{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.network.tx_errors{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.tx_errors{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}" } ], "formulas": [ @@ -493,8 +484,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.filesystem.usage{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.filesystem.usage{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}" } ], "formulas": [ @@ -541,8 +531,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.filesystem.usage_pct{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}", - "semantic_mode": "combined" + "query": "sum:kubernetes.filesystem.usage_pct{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}" } ], "formulas": [ @@ -598,8 +587,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.filesystem.usage{$scope,$kube_namespace,$kube_service,$kube_cluster_name,!pod_name:no_pod} by {kube_service,kube_namespace,kube_cluster_name}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -645,8 +633,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.network.tx_bytes{$scope,$kube_namespace,$kube_service,$kube_cluster_name,!pod_name:no_pod} by {kube_service,kube_namespace,kube_cluster_name}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -696,8 +683,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes_state.service.count{$scope,$kube_cluster_name}", - "aggregator": "last", - "semantic_mode": "combined" + "aggregator": "last" } ] } @@ -728,8 +714,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.pods.running{$kube_service,$kube_namespace,$kube_cluster_name,$scope} by {kube_service}", - "semantic_mode": "combined" + "query": "sum:kubernetes.pods.running{$kube_service,$kube_namespace,$kube_cluster_name,$scope} by {kube_service}" } ], "formulas": [ @@ -775,8 +760,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.pods.running{$kube_service,$kube_namespace,$kube_cluster_name,$scope} by {kube_service,kube_namespace,kube_cluster_name}", - "aggregator": "max", - "semantic_mode": "combined" + "aggregator": "max" } ], "sort": { diff --git a/kubernetes/assets/dashboards/kubernetes_statefulsets.json b/kubernetes/assets/dashboards/kubernetes_statefulsets.json index 3f0d52ec7e249..e66eb92a4b9b7 100644 --- a/kubernetes/assets/dashboards/kubernetes_statefulsets.json +++ b/kubernetes/assets/dashboards/kubernetes_statefulsets.json @@ -34,8 +34,7 @@ "aggregator": "last", "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.statefulset.replicas_ready{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.statefulset.replicas_ready{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set}" } ], "response_format": "scalar" @@ -78,8 +77,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.statefulset.replicas_ready{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set} by {kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.statefulset.replicas_ready{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set} by {kube_stateful_set}" } ], "response_format": "timeseries", @@ -133,8 +131,7 @@ "aggregator": "last", "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.statefulset.replicas_desired{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.statefulset.replicas_desired{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set}" } ], "response_format": "scalar" @@ -177,8 +174,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.statefulset.replicas_desired{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set} by {kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.statefulset.replicas_desired{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set} by {kube_stateful_set}" } ], "response_format": "timeseries", @@ -252,8 +248,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.statefulset.replicas_ready{$scope,$kube_namespace,$kube_cluster_name,$kube_stateful_set} by {kube_cluster_name,kube_namespace,kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.statefulset.replicas_ready{$scope,$kube_namespace,$kube_cluster_name,$kube_stateful_set} by {kube_cluster_name,kube_namespace,kube_stateful_set}" } ], "response_format": "timeseries", @@ -308,14 +303,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.statefulset.replicas_desired{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.statefulset.replicas_desired{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes_state.statefulset.replicas_ready{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.statefulset.replicas_ready{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set}" } ], "response_format": "timeseries", @@ -408,8 +401,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.cpu.usage.total{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_cluster_name,kube_namespace,kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.usage.total{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_cluster_name,kube_namespace,kube_stateful_set}" } ], "response_format": "timeseries", @@ -464,8 +456,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.memory.usage{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_namespace,kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.usage{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_namespace,kube_stateful_set}" } ], "response_format": "timeseries", @@ -510,8 +501,7 @@ "aggregator": "avg", "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.memory.usage{$scope,$kube_namespace,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_namespace,kube_cluster_name,kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.usage{$scope,$kube_namespace,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_namespace,kube_cluster_name,kube_stateful_set}" } ], "response_format": "scalar", @@ -557,8 +547,7 @@ "aggregator": "avg", "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.cpu.usage.total{$scope,$kube_namespace,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_namespace,kube_cluster_name,kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.usage.total{$scope,$kube_namespace,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_namespace,kube_cluster_name,kube_stateful_set}" } ], "response_format": "scalar", @@ -603,20 +592,17 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.cpu.requests{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.requests{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.cpu.usage.total{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.usage.total{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value}" }, { "data_source": "metrics", "name": "query3", - "query": "sum:kubernetes.cpu.limits{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value}", - "semantic_mode": "combined" + "query": "sum:kubernetes.cpu.limits{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value}" } ], "style": { @@ -658,20 +644,17 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.memory.requests{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.requests{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.memory.rss{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.rss{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value}" }, { "data_source": "metrics", "name": "query3", - "query": "sum:kubernetes.memory.limits{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value}", - "semantic_mode": "combined" + "query": "sum:kubernetes.memory.limits{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value}" } ], "style": { @@ -789,14 +772,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.rx_bytes{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_namespace,kube_cluster_name,kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.rx_bytes{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_namespace,kube_cluster_name,kube_stateful_set}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.network.tx_bytes{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_namespace,kube_cluster_name,kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.tx_bytes{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_namespace,kube_cluster_name,kube_stateful_set}" } ], "formulas": [ @@ -847,14 +828,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.network.rx_errors{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_namespace,kube_cluster_name,kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.rx_errors{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_namespace,kube_cluster_name,kube_stateful_set}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes.network.tx_errors{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_namespace,kube_cluster_name,kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.network.tx_errors{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_namespace,kube_cluster_name,kube_stateful_set}" } ], "formulas": [ @@ -911,8 +890,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.filesystem.usage{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_namespace,kube_cluster_name,kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.filesystem.usage{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_namespace,kube_cluster_name,kube_stateful_set}" } ], "formulas": [ @@ -960,8 +938,7 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes.filesystem.usage_pct{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_namespace,kube_cluster_name,kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes.filesystem.usage_pct{$kube_namespace,$scope,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_namespace,kube_cluster_name,kube_stateful_set}" } ], "formulas": [ @@ -1017,8 +994,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.filesystem.usage{$scope,$kube_namespace,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_namespace,kube_cluster_name,kube_stateful_set}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -1064,8 +1040,7 @@ "data_source": "metrics", "name": "query1", "query": "sum:kubernetes.network.tx_bytes{$scope,$kube_namespace,$kube_cluster_name,kube_stateful_set:$kube_stateful_set.value} by {kube_namespace,kube_cluster_name,kube_stateful_set}", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ], "formulas": [ @@ -1107,8 +1082,7 @@ "aggregator": "avg", "data_source": "metrics", "name": "query1", - "query": "max:kubernetes_state.statefulset.replicas{$scope,$kube_namespace,$kube_cluster_name,$kube_stateful_set} by {kube_cluster_name}", - "semantic_mode": "combined" + "query": "max:kubernetes_state.statefulset.replicas{$scope,$kube_namespace,$kube_cluster_name,$kube_stateful_set} by {kube_cluster_name}" } ], "response_format": "scalar", @@ -1163,8 +1137,7 @@ "aggregator": "last", "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.statefulset.replicas_current{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.statefulset.replicas_current{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set}" } ], "response_format": "scalar" @@ -1206,8 +1179,7 @@ "aggregator": "last", "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.statefulset.replicas_updated{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.statefulset.replicas_updated{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set}" } ], "response_format": "scalar" @@ -1249,8 +1221,7 @@ "aggregator": "last", "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.statefulset.replicas{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.statefulset.replicas{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set}" } ], "response_format": "scalar" @@ -1293,8 +1264,7 @@ "name": "query1", "data_source": "metrics", "query": "top(avg:kubernetes_state.daemonset.ready{$scope,$kube_namespace,$kube_cluster_name,$kube_stateful_set} by {kube_cluster_name,kube_namespace,kube_replica_set}, 10, 'mean', 'desc')", - "aggregator": "avg", - "semantic_mode": "combined" + "aggregator": "avg" } ] } @@ -1334,14 +1304,12 @@ { "data_source": "metrics", "name": "query1", - "query": "sum:kubernetes_state.statefulset.replicas_desired{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set} by {kube_cluster_name,kube_namespace,kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.statefulset.replicas_desired{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set} by {kube_cluster_name,kube_namespace,kube_stateful_set}" }, { "data_source": "metrics", "name": "query2", - "query": "sum:kubernetes_state.statefulset.replicas_ready{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set} by {kube_cluster_name,kube_namespace,kube_stateful_set}", - "semantic_mode": "combined" + "query": "sum:kubernetes_state.statefulset.replicas_ready{$scope,$kube_cluster_name,$kube_namespace,$kube_stateful_set} by {kube_cluster_name,kube_namespace,kube_stateful_set}" } ], "response_format": "timeseries",