Skip to content

Commit 15d96cc

Browse files
sblumenthalshanelhuang
sblumenthal
and
shanelhuang
authored
Revert "Update OOTB K8s Dashboards for OTel (#20938)" (#21123)
This reverts commit 88ba45b. Co-authored-by: Shanel Huang <[email protected]>
1 parent 71a841c commit 15d96cc

11 files changed

+497
-991
lines changed

‎kubernetes/assets/dashboards/kubernetes_clusters.json‎

Lines changed: 113 additions & 225 deletions
Large diffs are not rendered by default.

‎kubernetes/assets/dashboards/kubernetes_cpu_memory.json‎

Lines changed: 65 additions & 130 deletions
Large diffs are not rendered by default.

‎kubernetes/assets/dashboards/kubernetes_daemonsets.json‎

Lines changed: 33 additions & 66 deletions
Large diffs are not rendered by default.

‎kubernetes/assets/dashboards/kubernetes_dashboard.json‎

Lines changed: 47 additions & 94 deletions
Large diffs are not rendered by default.

‎kubernetes/assets/dashboards/kubernetes_deployments.json‎

Lines changed: 43 additions & 86 deletions
Large diffs are not rendered by default.

‎kubernetes/assets/dashboards/kubernetes_jobs.json‎

Lines changed: 47 additions & 94 deletions
Large diffs are not rendered by default.

‎kubernetes/assets/dashboards/kubernetes_nodes.json‎

Lines changed: 38 additions & 74 deletions
Large diffs are not rendered by default.

‎kubernetes/assets/dashboards/kubernetes_pods.json‎

Lines changed: 29 additions & 58 deletions
Large diffs are not rendered by default.

‎kubernetes/assets/dashboards/kubernetes_replicasets.json‎

Lines changed: 34 additions & 68 deletions
Large diffs are not rendered by default.

‎kubernetes/assets/dashboards/kubernetes_services.json‎

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@
4444
{
4545
"data_source": "metrics",
4646
"name": "query1",
47-
"query": "sum:kubernetes_state.service.count{$scope,$kube_cluster_name} by {type}",
48-
"semantic_mode": "combined"
47+
"query": "sum:kubernetes_state.service.count{$scope,$kube_cluster_name} by {type}"
4948
}
5049
],
5150
"style": {
@@ -106,8 +105,7 @@
106105
{
107106
"data_source": "metrics",
108107
"name": "query1",
109-
"query": "sum:kubernetes.cpu.usage.total{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}",
110-
"semantic_mode": "combined"
108+
"query": "sum:kubernetes.cpu.usage.total{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}"
111109
}
112110
],
113111
"formulas": [
@@ -154,8 +152,7 @@
154152
{
155153
"data_source": "metrics",
156154
"name": "query1",
157-
"query": "sum:kubernetes.memory.usage{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}",
158-
"semantic_mode": "combined"
155+
"query": "sum:kubernetes.memory.usage{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}"
159156
}
160157
],
161158
"formulas": [
@@ -204,8 +201,7 @@
204201
"data_source": "metrics",
205202
"name": "query1",
206203
"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}",
207-
"aggregator": "avg",
208-
"semantic_mode": "combined"
204+
"aggregator": "avg"
209205
}
210206
],
211207
"formulas": [
@@ -251,8 +247,7 @@
251247
"data_source": "metrics",
252248
"name": "query1",
253249
"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}",
254-
"aggregator": "avg",
255-
"semantic_mode": "combined"
250+
"aggregator": "avg"
256251
}
257252
],
258253
"formulas": [
@@ -372,14 +367,12 @@
372367
{
373368
"data_source": "metrics",
374369
"name": "query1",
375-
"query": "sum:kubernetes.network.rx_bytes{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}",
376-
"semantic_mode": "combined"
370+
"query": "sum:kubernetes.network.rx_bytes{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}"
377371
},
378372
{
379373
"data_source": "metrics",
380374
"name": "query2",
381-
"query": "sum:kubernetes.network.tx_bytes{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}",
382-
"semantic_mode": "combined"
375+
"query": "sum:kubernetes.network.tx_bytes{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}"
383376
}
384377
],
385378
"formulas": [
@@ -429,14 +422,12 @@
429422
{
430423
"data_source": "metrics",
431424
"name": "query1",
432-
"query": "sum:kubernetes.network.rx_errors{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}",
433-
"semantic_mode": "combined"
425+
"query": "sum:kubernetes.network.rx_errors{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}"
434426
},
435427
{
436428
"data_source": "metrics",
437429
"name": "query2",
438-
"query": "sum:kubernetes.network.tx_errors{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}",
439-
"semantic_mode": "combined"
430+
"query": "sum:kubernetes.network.tx_errors{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}"
440431
}
441432
],
442433
"formulas": [
@@ -493,8 +484,7 @@
493484
{
494485
"data_source": "metrics",
495486
"name": "query1",
496-
"query": "sum:kubernetes.filesystem.usage{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}",
497-
"semantic_mode": "combined"
487+
"query": "sum:kubernetes.filesystem.usage{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}"
498488
}
499489
],
500490
"formulas": [
@@ -541,8 +531,7 @@
541531
{
542532
"data_source": "metrics",
543533
"name": "query1",
544-
"query": "sum:kubernetes.filesystem.usage_pct{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}",
545-
"semantic_mode": "combined"
534+
"query": "sum:kubernetes.filesystem.usage_pct{$kube_namespace,$kube_service,$scope,$kube_cluster_name} by {kube_service,kube_namespace,kube_cluster_name}"
546535
}
547536
],
548537
"formulas": [
@@ -598,8 +587,7 @@
598587
"data_source": "metrics",
599588
"name": "query1",
600589
"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}",
601-
"aggregator": "avg",
602-
"semantic_mode": "combined"
590+
"aggregator": "avg"
603591
}
604592
],
605593
"formulas": [
@@ -645,8 +633,7 @@
645633
"data_source": "metrics",
646634
"name": "query1",
647635
"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}",
648-
"aggregator": "avg",
649-
"semantic_mode": "combined"
636+
"aggregator": "avg"
650637
}
651638
],
652639
"formulas": [
@@ -696,8 +683,7 @@
696683
"data_source": "metrics",
697684
"name": "query1",
698685
"query": "sum:kubernetes_state.service.count{$scope,$kube_cluster_name}",
699-
"aggregator": "last",
700-
"semantic_mode": "combined"
686+
"aggregator": "last"
701687
}
702688
]
703689
}
@@ -728,8 +714,7 @@
728714
{
729715
"data_source": "metrics",
730716
"name": "query1",
731-
"query": "sum:kubernetes.pods.running{$kube_service,$kube_namespace,$kube_cluster_name,$scope} by {kube_service}",
732-
"semantic_mode": "combined"
717+
"query": "sum:kubernetes.pods.running{$kube_service,$kube_namespace,$kube_cluster_name,$scope} by {kube_service}"
733718
}
734719
],
735720
"formulas": [
@@ -775,8 +760,7 @@
775760
"data_source": "metrics",
776761
"name": "query1",
777762
"query": "sum:kubernetes.pods.running{$kube_service,$kube_namespace,$kube_cluster_name,$scope} by {kube_service,kube_namespace,kube_cluster_name}",
778-
"aggregator": "max",
779-
"semantic_mode": "combined"
763+
"aggregator": "max"
780764
}
781765
],
782766
"sort": {

0 commit comments

Comments
 (0)