chore: address review comments

flanksource · Jun 18, 2024 · 709425a · 709425a
1 parent 8f470d8
commit 709425a
Show file tree

Hide file tree

Showing 4 changed files with 317 additions and 210 deletions.
diff --git a/charts/kubernetes/templates/_helpers.tpl b/charts/kubernetes/templates/_helpers.tpl
@@ -71,15 +71,15 @@ Metrics
 - name: cpu
   lookup:
     prometheus:
-    - query: '1000 * sum(rate(container_cpu_usage_seconds_total{container!=""{{.Values.prometheus.labels | default .Values.prometheusLabels}}}[5m]))'
+    - query: {{tpl .Values.metrics.queries.prometheus.cluster_cpu .}}
       connection: {{ .Values.prometheus.connection }}
       display:
         expr: |
           [{'name': 'cpu', 'value': int(results[0].value), 'headline': true, 'unit': 'millicores'}].toJSON()
 - name: memory
   lookup:
     prometheus:
-    - query: 'sum(container_memory_working_set_bytes{container!=""{{.Values.prometheus.labels | default .Values.prometheusLabels}}})'
+    - query: {{tpl .Values.metrics.queries.prometheus.cluster_memory .}}
       connection: {{ .Values.prometheus.connection }}
       display:
         expr: |
@@ -92,7 +92,7 @@ Metrics
 - name: cpu
   lookup:
     prometheus:
-    - query: '1000 * sum(rate(container_cpu_usage_seconds_total{container!=""{{.Values.prometheus.labels | default .Values.prometheusLabels}}}[5m])) by (node)'
+    - query: {{tpl .Values.metrics.queries.prometheus.node_cpu .}}
       connection: {{ .Values.prometheus.connection }}
       display:
         expr: |
@@ -103,7 +103,7 @@ Metrics
 - name: memory
   lookup:
     prometheus:
-    - query: 'sum(container_memory_working_set_bytes{container!="",pod!=""{{.Values.prometheus.labels | default .Values.prometheusLabels}}} * on(pod, namespace) group_left kube_pod_status_phase{phase="Running"{{.Values.prometheus.labels | default .Values.prometheusLabels}}} > 0) by (node)'
+    - query: {{tpl .Values.metrics.queries.prometheus.node_memory .}}
       connection: {{ .Values.prometheus.connection }}
       display:
         expr: |
@@ -115,7 +115,7 @@ Metrics
 - name: ephemeral-storage
   lookup:
     prometheus:
-    - query: 'max by (instance) (avg_over_time(node_filesystem_avail_bytes{mountpoint="/",fstype!="rootfs"{{.Values.prometheus.labels | default .Values.prometheusLabels}}}[5m]))'
+    - query: {{tpl .Values.metrics.queries.prometheus.node_storage .}}
       connection: {{ .Values.prometheus.connection }}
       display:
         expr: |
@@ -130,7 +130,7 @@ Metrics
 - name: cpu
   lookup:
     prometheus:
-    - query: '1000 * sum(rate(container_cpu_usage_seconds_total{container!=""{{.Values.prometheus.labels | default .Values.prometheusLabels}}}[5m])) by (pod)'
+    - query: {{tpl .Values.metrics.queries.prometheus.pod_cpu .}}
       connection: {{ .Values.prometheus.connection }}
       display:
         expr: |
@@ -141,7 +141,7 @@ Metrics
 - name: memory
   lookup:
     prometheus:
-    - query: 'sum(container_memory_working_set_bytes{container!=""{{.Values.prometheus.labels | default .Values.prometheusLabels}}}) by (pod)'
+    - query: {{tpl .Values.metrics.queries.prometheus.pod_memory .}}
       connection: {{ .Values.prometheus.connection }}
       display:
         expr: |
@@ -156,7 +156,7 @@ Metrics
 - name: cpu
   lookup:
     prometheus:
-    - query: '1000 * sum(rate(container_cpu_usage_seconds_total{container!=""{{.Values.prometheus.labels | default .Values.prometheusLabels}}}[5m])) by (namespace)'
+    - query: {{tpl .Values.metrics.queries.prometheus.namespace_cpu .}}
       connection: {{ .Values.prometheus.connection }}
       display:
         expr: |
@@ -167,7 +167,7 @@ Metrics
 - name: memory
   lookup:
     prometheus:
-    - query: 'sum(container_memory_working_set_bytes{container!="",pod!=""{{.Values.prometheus.labels | default .Values.prometheusLabels}}} * on(pod, namespace) group_left kube_pod_status_phase{phase="Running"{{.Values.prometheus.labels | default .Values.prometheusLabels}}} > 0) by (namespace)'
+    - query: {{tpl .Values.metrics.queries.prometheus.namespace_memory .}}
       connection: {{ .Values.prometheus.connection }}
       display:
         expr: |
@@ -251,31 +251,31 @@ Metrics
 {{- end }}
 
 {{- define "kubernetes.topology.metricProperties.cluster" -}}
-{{- if (.Values.prometheus.url | default .Values.prometheusURL) }}
+{{- if .Values.prometheus.url }}
 {{- include "kubernetes.topology.metricProperties.prometheus.cluster" . }}
 {{- else if .Values.metrics.enabled }}
 {{- include "kubernetes.topology.metricProperties.k8sMetrics.cluster" . }}
 {{- end }}
 {{- end }}
 
 {{- define "kubernetes.topology.metricProperties.node" -}}
-{{- if (.Values.prometheus.url | default .Values.prometheusURL) }}
+{{- if .Values.prometheus.url }}
 {{- include "kubernetes.topology.metricProperties.prometheus.node" . }}
 {{- else if .Values.metrics.enabled }}
 {{- include "kubernetes.topology.metricProperties.k8sMetrics.node" . }}
 {{- end }}
 {{- end }}
 
 {{- define "kubernetes.topology.metricProperties.pod" -}}
-{{- if (.Values.prometheus.url | default .Values.prometheusURL) }}
+{{- if .Values.prometheus.url }}
 {{- include "kubernetes.topology.metricProperties.prometheus.pod" . }}
 {{- else if .Values.metrics.enabled }}
 {{- include "kubernetes.topology.metricProperties.k8sMetrics.pod" . }}
 {{- end }}
 {{- end }}
 
 {{- define "kubernetes.topology.metricProperties.namespace" -}}
-{{- if (.Values.prometheus.url | default .Values.prometheusURL) }}
+{{- if .Values.prometheus.url }}
 {{- include "kubernetes.topology.metricProperties.prometheus.namespace" . }}
 {{- else if .Values.metrics.enabled }}
 {{- include "kubernetes.topology.metricProperties.k8sMetrics.namespace" . }}

diff --git a/charts/kubernetes/templates/topology.yaml b/charts/kubernetes/templates/topology.yaml
@@ -1,15 +1,17 @@
 ---
+{{- if and .Values.prometheus.createConnection .Values.prometheus.url }}
 apiVersion: mission-control.flanksource.com/v1
 kind: Connection
 metadata:
   name: {{ .Values.prometheus.connection }}
 spec:
   prometheus:
-    url: {{ .Values.prometheus.url | default .Values.prometheusURL }}
+    url: {{ .Values.prometheus.url }}
     {{- if .Values.prometheus.auth }}
     auth:
       {{ .Values.prometheus.auth | toYaml | nindent 6}}
     {{- end }}
+{{- end }}
 ---
 apiVersion: canaries.flanksource.com/v1
 kind: Topology