diff --git a/mixins/kubernetes/config.libsonnet b/mixins/kubernetes/config.libsonnet index 7a2b27ce9..4669d53df 100644 --- a/mixins/kubernetes/config.libsonnet +++ b/mixins/kubernetes/config.libsonnet @@ -37,19 +37,19 @@ 'apiserver.json': std.md5('apiserver.json'), 'cluster-total.json': std.md5('cluster-total.json'), 'controller-manager.json': std.md5('controller-manager.json'), - 'k8s-resources-cluster.json': 'efa86fd1d0c121a26444b636a3f56738', + 'k8s-resources-cluster.json': 'efa86fd1d0c121a26444b636a3f51111', 'k8s-resources-multicluster.json': std.md5('k8s-resources-multicluster.json'), - 'k8s-resources-namespace.json': '85a562078cdf77779eaa1add43cc6738', - 'k8s-resources-node.json': '200ac8fdbfbb74b39aff88118e4d6738', - 'k8s-resources-pod.json': '6581e46e4e5c7ba40a07646395ef6738', - 'k8s-resources-windows-cluster.json': '6438557df4391b100730f2494bcc6738', - 'k8s-resources-windows-namespace.json': '98e54027a2724ab1d4c45666c1fa6738', - 'k8s-resources-windows-pod.json': '56497a7ea5610e936dc6ed374a7c6738', - 'k8s-resources-workload.json': 'a164a7f0339f99e89cea5cb47e9b6738', - 'k8s-resources-workloads-namespace.json': 'a87fb0d919ec0ea5f6543124e16c6738', - 'k8s-windows-cluster-rsrc-use.json': 'VESDB6738', - 'k8s-windows-node-rsrc-use.json': 'YCBDf6738', - 'kubelet.json': '3138fa155d5915769fbded898ac06738', + 'k8s-resources-namespace.json': '85a562078cdf77779eaa1add43cc1111', + 'k8s-resources-node.json': '200ac8fdbfbb74b39aff88118e4d1111', + 'k8s-resources-pod.json': '6581e46e4e5c7ba40a07646395ef1111', + 'k8s-resources-windows-cluster.json': '6438557df4391b100730f2494bcc1111', + 'k8s-resources-windows-namespace.json': '98e54027a2724ab1d4c45666c1fa1111', + 'k8s-resources-windows-pod.json': '56497a7ea5610e936dc6ed374a7c1111', + 'k8s-resources-workload.json': 'a164a7f0339f99e89cea5cb47e9b1111', + 'k8s-resources-workloads-namespace.json': 'a87fb0d919ec0ea5f6543124e16c1111', + 'k8s-windows-cluster-rsrc-use.json': 'VESDB1111', + 'k8s-windows-node-rsrc-use.json': 'YCBDf1111', + 'kubelet.json': '3138fa155d5915769fbded898ac01111', 'namespace-by-pod.json': std.md5('namespace-by-pod.json'), 'namespace-by-workload.json': std.md5('namespace-by-workload.json'), 'persistentvolumesusage.json': std.md5('persistentvolumesusage.json'), diff --git a/mixins/kubernetes/dashboards/windows.libsonnet b/mixins/kubernetes/dashboards/windows.libsonnet index 2f49543fd..803225819 100644 --- a/mixins/kubernetes/dashboards/windows.libsonnet +++ b/mixins/kubernetes/dashboards/windows.libsonnet @@ -1025,19 +1025,19 @@ local var = g.dashboard.variable; + tsPanel.queryOptions.withTargets([ prometheus.new( '${datasource}', - 'max(rate(windows_logical_disk_read_bytes_total{%(clusterLabel)s="$cluster", %(windowsExporterSelector)s, instance="$instance"}[2m]))' % $._config + 'max(rate(windows_logical_disk_read_bytes_total{%(clusterLabel)s="$cluster", %(windowsExporterSelector)s, instance="$instance"}[$__rate_interval]))' % $._config ) + prometheus.withLegendFormat('read'), prometheus.new( '${datasource}', - 'max(rate(windows_logical_disk_write_bytes_total{%(clusterLabel)s="$cluster", %(windowsExporterSelector)s, instance="$instance"}[2m]))' % $._config + 'max(rate(windows_logical_disk_write_bytes_total{%(clusterLabel)s="$cluster", %(windowsExporterSelector)s, instance="$instance"}[$__rate_interval]))' % $._config ) + prometheus.withLegendFormat('written'), prometheus.new( '${datasource}', - 'max(rate(windows_logical_disk_read_seconds_total{%(clusterLabel)s="$cluster", %(windowsExporterSelector)s, instance="$instance"}[2m]) + rate(windows_logical_disk_write_seconds_total{%(clusterLabel)s="$cluster", %(windowsExporterSelector)s, instance="$instance"}[2m]))' % $._config + 'max(rate(windows_logical_disk_read_seconds_total{%(clusterLabel)s="$cluster", %(windowsExporterSelector)s, instance="$instance"}[$__rate_interval]) + rate(windows_logical_disk_write_seconds_total{%(clusterLabel)s="$cluster", %(windowsExporterSelector)s, instance="$instance"}[$__rate_interval]))' % $._config ) + prometheus.withLegendFormat('io time'), ])