diff --git a/charts/monitoring/Chart.yaml b/charts/monitoring/Chart.yaml index cb1ca7e..2f8810d 100644 --- a/charts/monitoring/Chart.yaml +++ b/charts/monitoring/Chart.yaml @@ -1,11 +1,11 @@ apiVersion: v2 appVersion: 1.16.0 +dependencies: +- condition: prometheus-msteams.enabled + name: prometheus-msteams + repository: https://kube-tarian.github.io/helmrepo-supporting-tools/ + version: 1.0.0 description: A Helm chart for Monitoring name: monitoring type: application -version: 0.1.13 -dependencies: - - name: prometheus-msteams - condition: prometheus-msteams.enabled - version: 1.0.0 - repository: https://kube-tarian.github.io/helmrepo-supporting-tools/ \ No newline at end of file +version: 0.1.14 diff --git a/charts/monitoring/templates/cluster-overview-dashboard.yaml b/charts/monitoring/templates/cluster-overview-dashboard.yaml index d7228e4..9a96660 100644 --- a/charts/monitoring/templates/cluster-overview-dashboard.yaml +++ b/charts/monitoring/templates/cluster-overview-dashboard.yaml @@ -559,7 +559,7 @@ data: }, "editorMode": "code", "expr": "kube_node_status_condition{cluster_name=\"$cluster_name\",condition=\"Ready\", status!=\"true\"}", - "legendFormat": "{{node}}", + "legendFormat": "{{`{{node}}`}}", "range": true, "refId": "A" } @@ -990,7 +990,7 @@ data: }, "editorMode": "code", "expr": "(1 - avg(irate(node_cpu_seconds_total{cluster_name=\"$cluster_name\",mode=\"idle\"}[1m])) by (instance)) * 100 / scalar(sum(machine_cpu_cores{cluster_name=\"$cluster_name\"}))\n", - "legendFormat": "{{instance}}", + "legendFormat": "{{`{{instance}}`}}", "range": true, "refId": "A" } @@ -1173,7 +1173,7 @@ data: }, "editorMode": "code", "expr": "100 - (avg by(instance) (rate(node_cpu_seconds_total{cluster_name=\"$cluster_name\",mode=\"idle\"}[2m])) * 100)", - "legendFormat": "{{instance}}", + "legendFormat": "{{`{{instance}}`}}", "range": true, "refId": "A" } @@ -2121,7 +2121,7 @@ data: }, "editorMode": "code", "expr": "(node_memory_MemTotal_bytes{cluster_name=\"$cluster_name\"}) - (node_memory_MemFree_bytes{cluster_name=\"$cluster_name\"}) - (node_memory_Cached_bytes{cluster_name=\"$cluster_name\"}) - (node_memory_Buffers_bytes{cluster_name=\"$cluster_name\"})", - "legendFormat": "{{instance}}", + "legendFormat": "{{`{{instance}}`}}", "range": true, "refId": "A" } diff --git a/charts/monitoring/templates/kubernetes-pods-metrics-dashboard.yaml b/charts/monitoring/templates/kubernetes-pods-metrics-dashboard.yaml index 2eb846a..86a5332 100644 --- a/charts/monitoring/templates/kubernetes-pods-metrics-dashboard.yaml +++ b/charts/monitoring/templates/kubernetes-pods-metrics-dashboard.yaml @@ -122,7 +122,7 @@ data: "expr": "kube_pod_info{pod=\"$pod\"}", "instant": true, "interval": "", - "legendFormat": "{{ created_by_kind }}: {{ created_by_name }}", + "legendFormat": "{{`{{ created_by_kind }}`}}: {{`{{ created_by_name }}`}}", "refId": "A" } ], @@ -190,7 +190,7 @@ data: "expr": "kube_pod_info{pod=\"$pod\"}", "instant": true, "interval": "", - "legendFormat": "{{ node }}", + "legendFormat": "{{`{{ node }}`}}", "refId": "A" } ], @@ -252,7 +252,7 @@ data: "expr": "kube_pod_info{pod=\"$pod\"}", "instant": true, "interval": "", - "legendFormat": "{{ pod_ip }}", + "legendFormat": "{{`{{ pod_ip }}`}}", "refId": "A" } ], @@ -315,7 +315,7 @@ data: "format": "time_series", "instant": true, "interval": "", - "legendFormat": "{{ priority_class }}", + "legendFormat": "{{`{{ priority_class }}`}}", "range": false, "refId": "A" } @@ -410,7 +410,7 @@ data: "expr": "kube_pod_status_qos_class{pod=\"$pod\"} > 0", "instant": true, "interval": "", - "legendFormat": "{{ qos_class }}", + "legendFormat": "{{`{{ qos_class }}`}}", "refId": "A" } ], @@ -474,7 +474,7 @@ data: "expr": "kube_pod_container_status_last_terminated_reason{pod=\"$pod\"}", "instant": true, "interval": "", - "legendFormat": "{{ reason }}", + "legendFormat": "{{`{{ reason }}`}}", "refId": "A" } ], @@ -1284,7 +1284,7 @@ data: "exemplar": true, "expr": "sum(rate(container_cpu_usage_seconds_total{pod=\"$pod\", image!=\"\"}[$__rate_interval])) by (container) / sum(kube_pod_container_resource_requests{ pod=\"$pod\", resource=\"cpu\"}) by (container)", "interval": "$resolution", - "legendFormat": "{{ container }} REQUESTS", + "legendFormat": "{{`{{ container }}`}} REQUESTS", "range": true, "refId": "A" }, @@ -1296,7 +1296,7 @@ data: "editorMode": "code", "expr": "sum(rate(container_cpu_usage_seconds_total{pod=\"$pod\", image!=\"\"}[$__rate_interval])) by (container) / sum(kube_pod_container_resource_limits{pod=\"$pod\", resource=\"cpu\"}) by (container)", "hide": false, - "legendFormat": "{{ container }} LIMITS", + "legendFormat": "{{`{{ container }}`}} LIMITS", "range": true, "refId": "B" } @@ -1410,7 +1410,7 @@ data: "exemplar": true, "expr": "sum(container_memory_working_set_bytes{pod=\"$pod\", image!=\"\"}) by (container) / sum(kube_pod_container_resource_requests{pod=\"$pod\", resource=\"memory\"}) by (container)", "interval": "", - "legendFormat": "{{ container }} REQUESTS", + "legendFormat": "{{`{{ container }}`}} REQUESTS", "range": true, "refId": "A" }, @@ -1422,7 +1422,7 @@ data: "editorMode": "code", "expr": "sum(container_memory_working_set_bytes{pod=\"$pod\", image!=\"\"}) by (container) / sum(kube_pod_container_resource_limits{ pod=\"$pod\", resource=\"memory\"}) by (container)", "hide": false, - "legendFormat": "{{ container }} LIMITS", + "legendFormat": "{{`{{ container }}`}} LIMITS", "range": true, "refId": "B" } @@ -1542,7 +1542,7 @@ data: "exemplar": true, "expr": "sum(rate(container_cpu_usage_seconds_total{pod=\"$pod\", image!=\"\", container!=\"\"}[$__rate_interval])) by (container)", "interval": "$resolution", - "legendFormat": "{{ container }}", + "legendFormat": "{{`{{ container }}`}}", "range": true, "refId": "A" } @@ -1645,7 +1645,7 @@ data: "exemplar": true, "expr": "sum(container_memory_working_set_bytes{pod=\"$pod\", image!=\"\", container!=\"\"}) by (container)", "interval": "", - "legendFormat": "{{ container }}", + "legendFormat": "{{`{{ container }}`}}", "range": true, "refId": "A" } @@ -1751,7 +1751,7 @@ data: "exemplar": true, "expr": "sum(rate(container_cpu_cfs_throttled_seconds_total{pod=\"$pod\", image!=\"\", container!=\"\"}[$__rate_interval])) by (container)", "interval": "$resolution", - "legendFormat": "{{ container }}", + "legendFormat": "{{`{{ container }}`}}", "range": true, "refId": "A" } @@ -1877,7 +1877,7 @@ data: "exemplar": true, "expr": "sum(increase(container_oom_events_total{pod=\"${pod}\", container!=\"\"}[$__rate_interval])) by (container)", "interval": "", - "legendFormat": "{{ container }}", + "legendFormat": "{{`{{ container }}`}}", "range": true, "refId": "A" } @@ -1990,7 +1990,7 @@ data: "exemplar": true, "expr": "sum(increase(kube_pod_container_status_restarts_total{pod=\"${pod}\", container!=\"\"}[$__rate_interval])) by (container)", "interval": "", - "legendFormat": "{{ container }}", + "legendFormat": "{{`{{ container }}`}}", "range": true, "refId": "A" } diff --git a/charts/monitoring/templates/node-logs-dashboard.yaml b/charts/monitoring/templates/node-logs-dashboard.yaml index 5c92991..1954092 100644 --- a/charts/monitoring/templates/node-logs-dashboard.yaml +++ b/charts/monitoring/templates/node-logs-dashboard.yaml @@ -272,7 +272,7 @@ data: "editorMode": "builder", "expr": "count_over_time({cluster_name=\"$cluster_name\", node_name=\"$node\"} |= `$filter` [$__range])", "key": "Q-a8862167-ca91-49e3-9b89-52a7b6164229-0", - "legendFormat": "{{node_name}}", + "legendFormat": "{{`{{node_name}}`}}", "queryType": "range", "refId": "A" } diff --git a/charts/monitoring/templates/openebs-cstor-dashboard.yaml b/charts/monitoring/templates/openebs-cstor-dashboard.yaml index 6125dbb..afa5112 100644 --- a/charts/monitoring/templates/openebs-cstor-dashboard.yaml +++ b/charts/monitoring/templates/openebs-cstor-dashboard.yaml @@ -97,7 +97,7 @@ data: "expr": "(openebs_maya_exporter_version{cluster=\"$cluster\"})", "format": "table", "interval": "", - "legendFormat": "{{version}}", + "legendFormat": "{{`{{version}}`}}", "range": true, "refId": "A" } @@ -280,7 +280,7 @@ data: "expr": "(kube_pod_container_status_ready{cluster=\"$cluster\",namespace=\"openebs-cstor\"})", "instant": true, "interval": "", - "legendFormat": "{{pod}}::{{container}}", + "legendFormat": "{{`{{pod}}`}}::{{`{{container}}`}}", "refId": "A" } ], @@ -363,7 +363,7 @@ data: "expr": "count(kube_pod_spec_volumes_persistentvolumeclaims_readonly{cluster=\"$cluster\",namespace=\"$namespace\"} != 0) ", "hide": false, "instant": false, - "legendFormat": "{{pod}}", + "legendFormat": "{{`{{pod}}`}}", "refId": "A" }, { @@ -454,7 +454,7 @@ data: "expr": "count(kube_pod_container_status_waiting{cluster=\"$cluster\",namespace=\"$namespace\"} !=0 ) or vector(0)", "hide": false, "instant": false, - "legendFormat": "{{pod}}", + "legendFormat": "{{`{{pod}}`}}", "refId": "A" }, { @@ -542,7 +542,7 @@ data: "expr": "count(kube_persistentvolumeclaim_info{cluster=\"$cluster\"}) ", "hide": false, "instant": false, - "legendFormat": "{{pod}}", + "legendFormat": "{{`{{pod}}`}}", "refId": "A" }, { @@ -724,7 +724,7 @@ data: "hide": false, "instant": false, "interval": "", - "legendFormat": "{{pod}}", + "legendFormat": "{{`{{pod}}`}}", "refId": "A" }, { @@ -817,7 +817,7 @@ data: "hide": false, "instant": false, "interval": "", - "legendFormat": "{{pod}}", + "legendFormat": "{{`{{pod}}`}}", "refId": "A" }, { @@ -910,7 +910,7 @@ data: "hide": false, "instant": false, "interval": "", - "legendFormat": "{{pod}}", + "legendFormat": "{{`{{pod}}`}}", "refId": "A" }, { @@ -1068,7 +1068,7 @@ data: "expr": "count(kube_pod_container_status_terminated{cluster=\"$cluster\",namespace=\"$namespace\"} !=0 ) or vector(0)", "hide": false, "instant": false, - "legendFormat": "{{pod}}", + "legendFormat": "{{`{{pod}}`}}", "refId": "A" }, { @@ -1307,7 +1307,7 @@ data: "expr": "kubelet_volume_stats_available_bytes\n / kubelet_volume_stats_capacity_bytes", "instant": true, "interval": "", - "legendFormat": "{{persistentvolumeclaim}}", + "legendFormat": "{{`{{persistentvolumeclaim}}`}}", "refId": "B" } ], @@ -1625,7 +1625,7 @@ data: "instant": false, "interval": "", "intervalFactor": 1, - "legendFormat": "{{pod_name}}", + "legendFormat": "{{`{{pod_name}}`}}", "refId": "A" } ], @@ -1725,7 +1725,7 @@ data: "instant": false, "interval": "", "intervalFactor": 1, - "legendFormat": "{{pod}}", + "legendFormat": "{{`{{pod}}`}}", "refId": "A" } ], @@ -1821,7 +1821,7 @@ data: }, "expr": "count by (node)(kube_pod_info{cluster=\"$cluster\",namespace=\"$namespace\"})", "hide": false, - "legendFormat": "{{node}}", + "legendFormat": "{{`{{node}}`}}", "refId": "A" } ], @@ -1924,7 +1924,7 @@ data: "expr": "increase(kube_pod_container_status_restarts_total{cluster=\"$cluster\",namespace=\"$namespace\"}[2m]) ", "format": "time_series", "interval": "", - "legendFormat": "{{pod}}", + "legendFormat": "{{`{{pod}}`}}", "refId": "A", "units": "none", "valueHandler": "Number Threshold" @@ -2023,7 +2023,7 @@ data: "hide": false, "instant": false, "interval": "", - "legendFormat": "TERMINATED::{{reason}}::{{pod}}", + "legendFormat": "TERMINATED::{{`{{reason}}`}}::{{`{{pod}}`}}", "refId": "A" }, { @@ -2034,7 +2034,7 @@ data: "expr": "count by(pod,reason) (kube_pod_container_status_waiting_reason{cluster=\"$cluster\",namespace=\"$namespace\"} !=0 )", "hide": false, "interval": "", - "legendFormat": "WAITING::{{reason}}::{{pod}}", + "legendFormat": "WAITING::{{`{{reason}}`}}::{{`{{pod}}`}}", "refId": "B" }, { @@ -2528,7 +2528,7 @@ data: "expr": "(openebs_total_replica_count{cluster=\"$cluster\"})", "instant": true, "interval": "", - "legendFormat": "{{pod}}", + "legendFormat": "{{`{{pod}}`}}", "refId": "B" } ],