This is an automated email from the ASF dual-hosted git repository.
zhongxjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
The following commit(s) were added to refs/heads/master by this push:
new 6d9a1156 [charts] add dashboards yaml to kube-prometheus (#462)
6d9a1156 is described below
commit 6d9a1156dab3ab99163a7ff58567c22352594d31
Author: mfordjody <[email protected]>
AuthorDate: Tue Oct 15 09:16:36 2024 +0800
[charts] add dashboards yaml to kube-prometheus (#462)
---
.../modular/dashboards/dubbo-metrics.yaml | 59 ++++++++++++++++++++++
.../templates/modular/dashboards/dubbo-traces.yaml | 59 ++++++++++++++++++++++
2 files changed, 118 insertions(+)
diff --git
a/manifests/charts/admin/templates/modular/dashboards/dubbo-metrics.yaml
b/manifests/charts/admin/templates/modular/dashboards/dubbo-metrics.yaml
new file mode 100644
index 00000000..9e6ac477
--- /dev/null
+++ b/manifests/charts/admin/templates/modular/dashboards/dubbo-metrics.yaml
@@ -0,0 +1,59 @@
+{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion
.Values.kubeTargetVersionOverride }}
+{{- if and (or .Values.grafana.enabled .Values.grafana.forceDeployDashboards)
(semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9"
$kubeTargetVersion) .Values.grafana.defaultDashboardsEnabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }}
+ name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $)
"dubbo-application-metrics" | trunc 63 | trimSuffix "-" }}
+ annotations:
+{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }}
+ labels:
+ {{- if $.Values.grafana.sidecar.dashboards.label }}
+ {{ $.Values.grafana.sidecar.dashboards.label }}: {{ ternary
$.Values.grafana.sidecar.dashboards.labelValue "1" (not (empty
$.Values.grafana.sidecar.dashboards.labelValue)) | quote }}
+ {{- end }}
+ app: {{ template "kube-prometheus-stack.name" $ }}-grafana
+{{ include "kube-prometheus-stack.labels" $ | indent 4 }}
+data:
+ dubbo-application-metrics.json: |-
+ {{`{"editable":`}}{{ .Values.grafana.defaultDashboardsEditable
}}{{`,"links":[{"asDropdown":true,"includeVars":true,"keepTime":true,"tags":["kubernetes-mixin"],"targetBlank":false,"title":"Kubernetes","type":"dashboards"}],"panels":[{"datasource":{"type":"datasource","uid":"--
Mixed
--"},"fieldConfig":{"defaults":{"unit":"percentunit"}},"gridPos":{"h":3,"w":4,"x":0,"y":0},"id":1,"interval":"1m","options":{"colorMode":"none"},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":
[...]
+{{- end }}
+---
+{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion
.Values.kubeTargetVersionOverride }}
+{{- if and (or .Values.grafana.enabled .Values.grafana.forceDeployDashboards)
(semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9"
$kubeTargetVersion) .Values.grafana.defaultDashboardsEnabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }}
+ name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $)
"k8s-resources-cluster" | trunc 63 | trimSuffix "-" }}
+ annotations:
+{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }}
+ labels:
+ {{- if $.Values.grafana.sidecar.dashboards.label }}
+ {{ $.Values.grafana.sidecar.dashboards.label }}: {{ ternary
$.Values.grafana.sidecar.dashboards.labelValue "1" (not (empty
$.Values.grafana.sidecar.dashboards.labelValue)) | quote }}
+ {{- end }}
+ app: {{ template "kube-prometheus-stack.name" $ }}-grafana
+{{ include "kube-prometheus-stack.labels" $ | indent 4 }}
+data:
+ dubbo-instance-metrics.json: |-
+ {{`{"editable":`}}{{ .Values.grafana.defaultDashboardsEditable
}}{{`,"links":[{"asDropdown":true,"includeVars":true,"keepTime":true,"tags":["kubernetes-mixin"],"targetBlank":false,"title":"Kubernetes","type":"dashboards"}],"panels":[{"datasource":{"type":"datasource","uid":"--
Mixed
--"},"fieldConfig":{"defaults":{"unit":"percentunit"}},"gridPos":{"h":3,"w":4,"x":0,"y":0},"id":1,"interval":"1m","options":{"colorMode":"none"},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":
[...]
+{{- end }}
+---
+{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion
.Values.kubeTargetVersionOverride }}
+{{- if and (or .Values.grafana.enabled .Values.grafana.forceDeployDashboards)
(semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9"
$kubeTargetVersion) .Values.grafana.defaultDashboardsEnabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }}
+ name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $)
"dubbo-service-metrics" | trunc 63 | trimSuffix "-" }}
+ annotations:
+{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }}
+ labels:
+ {{- if $.Values.grafana.sidecar.dashboards.label }}
+ {{ $.Values.grafana.sidecar.dashboards.label }}: {{ ternary
$.Values.grafana.sidecar.dashboards.labelValue "1" (not (empty
$.Values.grafana.sidecar.dashboards.labelValue)) | quote }}
+ {{- end }}
+ app: {{ template "kube-prometheus-stack.name" $ }}-grafana
+{{ include "kube-prometheus-stack.labels" $ | indent 4 }}
+data:
+ dubbo-service-metrics.json: |-
+ {{`{"editable":`}}{{ .Values.grafana.defaultDashboardsEditable
}}{{`,"links":[{"asDropdown":true,"includeVars":true,"keepTime":true,"tags":["kubernetes-mixin"],"targetBlank":false,"title":"Kubernetes","type":"dashboards"}],"panels":[{"datasource":{"type":"datasource","uid":"--
Mixed
--"},"fieldConfig":{"defaults":{"unit":"percentunit"}},"gridPos":{"h":3,"w":4,"x":0,"y":0},"id":1,"interval":"1m","options":{"colorMode":"none"},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":
[...]
+{{- end }}
\ No newline at end of file
diff --git
a/manifests/charts/admin/templates/modular/dashboards/dubbo-traces.yaml
b/manifests/charts/admin/templates/modular/dashboards/dubbo-traces.yaml
new file mode 100644
index 00000000..a57f13ed
--- /dev/null
+++ b/manifests/charts/admin/templates/modular/dashboards/dubbo-traces.yaml
@@ -0,0 +1,59 @@
+{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion
.Values.kubeTargetVersionOverride }}
+{{- if and (or .Values.grafana.enabled .Values.grafana.forceDeployDashboards)
(semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9"
$kubeTargetVersion) .Values.grafana.defaultDashboardsEnabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }}
+ name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $)
"dubbo-application-traces" | trunc 63 | trimSuffix "-" }}
+ annotations:
+{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }}
+ labels:
+ {{- if $.Values.grafana.sidecar.dashboards.label }}
+ {{ $.Values.grafana.sidecar.dashboards.label }}: {{ ternary
$.Values.grafana.sidecar.dashboards.labelValue "1" (not (empty
$.Values.grafana.sidecar.dashboards.labelValue)) | quote }}
+ {{- end }}
+ app: {{ template "kube-prometheus-stack.name" $ }}-grafana
+{{ include "kube-prometheus-stack.labels" $ | indent 4 }}
+data:
+ dubbo-application-traces.json: |-
+ {{`{"editable":`}}{{ .Values.grafana.defaultDashboardsEditable
}}{{`,"links":[{"asDropdown":true,"includeVars":true,"keepTime":true,"tags":["kubernetes-mixin"],"targetBlank":false,"title":"Kubernetes","type":"dashboards"}],"panels":[{"datasource":{"type":"datasource","uid":"--
Mixed
--"},"fieldConfig":{"defaults":{"unit":"percentunit"}},"gridPos":{"h":3,"w":4,"x":0,"y":0},"id":1,"interval":"1m","options":{"colorMode":"none"},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":
[...]
+{{- end }}
+---
+{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion
.Values.kubeTargetVersionOverride }}
+{{- if and (or .Values.grafana.enabled .Values.grafana.forceDeployDashboards)
(semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9"
$kubeTargetVersion) .Values.grafana.defaultDashboardsEnabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }}
+ name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $)
"dubbo-instance-traces" | trunc 63 | trimSuffix "-" }}
+ annotations:
+{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }}
+ labels:
+ {{- if $.Values.grafana.sidecar.dashboards.label }}
+ {{ $.Values.grafana.sidecar.dashboards.label }}: {{ ternary
$.Values.grafana.sidecar.dashboards.labelValue "1" (not (empty
$.Values.grafana.sidecar.dashboards.labelValue)) | quote }}
+ {{- end }}
+ app: {{ template "kube-prometheus-stack.name" $ }}-grafana
+{{ include "kube-prometheus-stack.labels" $ | indent 4 }}
+data:
+ dubbo-instance-traces.json: |-
+ {{`{"editable":`}}{{ .Values.grafana.defaultDashboardsEditable
}}{{`,"links":[{"asDropdown":true,"includeVars":true,"keepTime":true,"tags":["kubernetes-mixin"],"targetBlank":false,"title":"Kubernetes","type":"dashboards"}],"panels":[{"datasource":{"type":"datasource","uid":"--
Mixed
--"},"fieldConfig":{"defaults":{"unit":"percentunit"}},"gridPos":{"h":3,"w":4,"x":0,"y":0},"id":1,"interval":"1m","options":{"colorMode":"none"},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":
[...]
+{{- end }}
+---
+{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion
.Values.kubeTargetVersionOverride }}
+{{- if and (or .Values.grafana.enabled .Values.grafana.forceDeployDashboards)
(semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9"
$kubeTargetVersion) .Values.grafana.defaultDashboardsEnabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }}
+ name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $)
"dubbo-service-traces" | trunc 63 | trimSuffix "-" }}
+ annotations:
+{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }}
+ labels:
+ {{- if $.Values.grafana.sidecar.dashboards.label }}
+ {{ $.Values.grafana.sidecar.dashboards.label }}: {{ ternary
$.Values.grafana.sidecar.dashboards.labelValue "1" (not (empty
$.Values.grafana.sidecar.dashboards.labelValue)) | quote }}
+ {{- end }}
+ app: {{ template "kube-prometheus-stack.name" $ }}-grafana
+{{ include "kube-prometheus-stack.labels" $ | indent 4 }}
+data:
+ dubbo-service-traces.json: |-
+ {{`{"editable":`}}{{ .Values.grafana.defaultDashboardsEditable
}}{{`,"links":[{"asDropdown":true,"includeVars":true,"keepTime":true,"tags":["kubernetes-mixin"],"targetBlank":false,"title":"Kubernetes","type":"dashboards"}],"panels":[{"datasource":{"type":"datasource","uid":"--
Mixed
--"},"fieldConfig":{"defaults":{"unit":"percentunit"}},"gridPos":{"h":3,"w":4,"x":0,"y":0},"id":1,"interval":"1m","options":{"colorMode":"none"},"pluginVersion":"v11.0.0","targets":[{"datasource":{"type":
[...]
+{{- end }}
\ No newline at end of file
