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 b1817f77 [charts] update grafana dashboards (#467)
b1817f77 is described below
commit b1817f77fdd5968aeaaff88f82b5e80eb6135493
Author: mfordjody <[email protected]>
AuthorDate: Wed Oct 16 16:24:49 2024 +0800
[charts] update grafana dashboards (#467)
---
manifests/charts/admin/dashboards.yaml | 10 --
...o-metrics.yaml => dubbo-resources-metrics.yaml} | 18 ++--
.../admin/files/dashboards/dubbo-traces.yaml | 59 ------------
manifests/charts/admin/files/helm.sh | 17 ----
manifests/charts/admin/files/kubectl.sh | 9 --
.../admin/templates/{install.yaml => jobs.yaml} | 106 ++++++++++++++-------
6 files changed, 79 insertions(+), 140 deletions(-)
diff --git a/manifests/charts/admin/dashboards.yaml
b/manifests/charts/admin/dashboards.yaml
deleted file mode 100644
index 3b13970d..00000000
--- a/manifests/charts/admin/dashboards.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: dashboards-config
- namespace: default
-data:
- {{- range $file := .Files.Glob "files/dashboards/**.yaml" }}
- {{ $file.Name | basename }}: |-
- {{ .Files.Get $file.Name | indent 4 }}
- {{- end }}
\ No newline at end of file
diff --git a/manifests/charts/admin/files/dashboards/dubbo-metrics.yaml
b/manifests/charts/admin/files/dashboards/dubbo-resources-metrics.yaml
similarity index 99%
rename from manifests/charts/admin/files/dashboards/dubbo-metrics.yaml
rename to manifests/charts/admin/files/dashboards/dubbo-resources-metrics.yaml
index a4ba9a00..35b00c54 100644
--- a/manifests/charts/admin/files/dashboards/dubbo-metrics.yaml
+++ b/manifests/charts/admin/files/dashboards/dubbo-resources-metrics.yaml
@@ -4,7 +4,7 @@ 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 "-" }}
+ name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $)
"dubbo-app-metrics" | trunc 63 | trimSuffix "-" }}
annotations:
{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }}
labels:
@@ -14,9 +14,9 @@ metadata:
app: {{ template "kube-prometheus-stack.name" $ }}-grafana
{{ include "kube-prometheus-stack.labels" $ | indent 4 }}
data:
- dubbo-application-metrics.json: |-
+ dubbo-app-metrics.json: |-
{{`{"annotations":{"list":[{"builtIn":1,"datasource":{"type":"grafana","uid":"--
Grafana --"},"enable":true,"hide":true,"iconColor":"rgba(0, 211, 255,
1)","name":"Annotations &
Alerts","type":"dashboard"}]},"editable":true,"fiscalYearStartMonth":0,"graphTooltip":0,"id":5,"links":[],"liveNow":false,"panels":[{"collapsed":false,"gridPos":{"h":1,"w":24,"x":0,"y":0},"id":14,"panels":[],"title":"应用概览","type":"row"},{"datasource":{"type":"prometheus","uid":"${datasource}"},"fieldConfig":{"
[...]
-{{- end }}
+ {{- 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 }}
@@ -24,7 +24,7 @@ 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 "-" }}
+ name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $)
"dubbo-ins-metrics" | trunc 63 | trimSuffix "-" }}
annotations:
{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }}
labels:
@@ -34,9 +34,9 @@ metadata:
app: {{ template "kube-prometheus-stack.name" $ }}-grafana
{{ include "kube-prometheus-stack.labels" $ | indent 4 }}
data:
- dubbo-instance-metrics.json: |-
+ dubbo-ins-metrics.json: |-
{{`{"annotations":{"list":[{"builtIn":1,"datasource":{"type":"grafana","uid":"--
Grafana --"},"enable":true,"hide":true,"iconColor":"rgba(0, 211, 255,
1)","name":"Annotations &
Alerts","type":"dashboard"}]},"editable":true,"fiscalYearStartMonth":0,"graphTooltip":0,"id":6,"links":[],"liveNow":false,"panels":[{"collapsed":false,"gridPos":{"h":1,"w":24,"x":0,"y":0},"id":1,"panels":[],"title":"实例概览","type":"row"},{"datasource":{"type":"prometheus","uid":"${datasource}"},"fieldConfig":{"d
[...]
-{{- end }}
+ {{- 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 }}
@@ -44,7 +44,7 @@ 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 "-" }}
+ name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $)
"dubbo-svc-metrics" | trunc 63 | trimSuffix "-" }}
annotations:
{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }}
labels:
@@ -54,6 +54,6 @@ metadata:
app: {{ template "kube-prometheus-stack.name" $ }}-grafana
{{ include "kube-prometheus-stack.labels" $ | indent 4 }}
data:
- dubbo-service-metrics.json: |-
+ dubbo-svc-metrics.json: |-
{{`{"annotations":{"list":[{"builtIn":1,"datasource":{"type":"grafana","uid":"--
Grafana --"},"enable":true,"hide":true,"iconColor":"rgba(0, 211, 255,
1)","name":"Annotations &
Alerts","type":"dashboard"}]},"editable":true,"fiscalYearStartMonth":0,"graphTooltip":0,"id":7,"links":[],"liveNow":false,"panels":[{"collapsed":false,"gridPos":{"h":1,"w":24,"x":0,"y":0},"id":5,"panels":[],"title":"接口总览","type":"row"},{"datasource":{"type":"prometheus","uid":"${datasource}"},"fieldConfig":{"d
[...]
-{{- end }}
\ No newline at end of file
+ {{- end }}
\ No newline at end of file
diff --git a/manifests/charts/admin/files/dashboards/dubbo-traces.yaml
b/manifests/charts/admin/files/dashboards/dubbo-traces.yaml
deleted file mode 100644
index a57f13ed..00000000
--- a/manifests/charts/admin/files/dashboards/dubbo-traces.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-{{- $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
diff --git a/manifests/charts/admin/files/helm.sh
b/manifests/charts/admin/files/helm.sh
deleted file mode 100644
index 59b67674..00000000
--- a/manifests/charts/admin/files/helm.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -eux
-
-
-
-PROMETHEUS="https://prometheus-community.github.io/helm-charts";
-ISTIO="https://istio-release.storage.googleapis.com/charts";
-
-helm pull kube-prometheus-stack --repo "$PROMETHEUS" --version 65.2.0 --untar
&& \
-cp -r "/files/dashboards/"
kube-prometheus-stack/templates/grafana/dashboards-1.14/ && \
-cd kube-prometheus-stack && \
-helm install kube-prometheus-stack -f values.yaml . && \
-helm repo add istio "$ISTIO" && \
-helm repo update && \
-helm install istio-base istio/base -n istio-system --set
defaultRevision=default && \
-helm install istiod istio/istiod -n istio-system
diff --git a/manifests/charts/admin/files/kubectl.sh
b/manifests/charts/admin/files/kubectl.sh
deleted file mode 100644
index 2ea3d6ab..00000000
--- a/manifests/charts/admin/files/kubectl.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -eux
-
-JAEGER="https://raw.githubusercontent.com/istio/istio/release-1.23/samples/addons/jaeger.yaml";
-
-kubectl apply -f $JAEGER
-
-kubectl get namespace istio-system >/dev/null 2>&1 || kubectl create namespace
istio-system
diff --git a/manifests/charts/admin/templates/install.yaml
b/manifests/charts/admin/templates/jobs.yaml
similarity index 50%
rename from manifests/charts/admin/templates/install.yaml
rename to manifests/charts/admin/templates/jobs.yaml
index 6301a609..fe66b57e 100644
--- a/manifests/charts/admin/templates/install.yaml
+++ b/manifests/charts/admin/templates/jobs.yaml
@@ -14,9 +14,43 @@ metadata:
"helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
data:
kubectl.sh: |-
- {{- .Files.Get "files/kubectl.sh" | nindent 4 }}
+ #!/bin/bash
+
+ set -eux
+
+ WORKDIR=$(dirname "$0")
+ WORKDIR=$(cd "$WORKDIR"; pwd)
+
+
JAEGER="https://raw.githubusercontent.com/istio/istio/release-1.23/samples/addons/jaeger.yaml";
+
+ kubectl apply -f $JAEGER
+
+ kubectl get namespace istio-system >/dev/null 2>&1 || kubectl create
namespace istio-system
+
helm.sh: |-
- {{- .Files.Get "files/helm.sh" | nindent 4 }}
+ #!/bin/bash
+
+ set -eux
+
+ PROMETHEUS="https://prometheus-community.github.io/helm-charts";
+ ISTIO="https://istio-release.storage.googleapis.com/charts";
+
+ helm pull kube-prometheus-stack --repo "$PROMETHEUS" --version 65.2.0
--untar && \
+ cp -r "/files/dashboards/"
kube-prometheus-stack/templates/grafana/dashboards-1.14 && \
+ ls -la kube-prometheus-stack/templates/grafana/dashboards-1.14 && \
+ helm install kube-prometheus ./kube-prometheus-stack/ && \
+ helm upgrade --install kube-prometheus ./kube-prometheus-stack/ && \
+ if [ $? -eq 0 ]; then
+ continue
+ fi
+ helm upgrade --install kube-prometheus ./kube-prometheus-stack/
+ helm repo add istio "$ISTIO" && \
+ helm repo update && \
+ helm install istio-base istio/base -n istio-system --set
defaultRevision=default && \
+ helm install istiod istio/istiod -n istio-system
+
+ dubbo-resources-metrics.yaml: |-
+ {{- .Files.Get "files/dashboards/dubbo-resources-metrics.yaml" | nindent 4
}}
---
apiVersion: batch/v1
kind: Job
@@ -41,26 +75,29 @@ spec:
dnsPolicy: "None"
dnsConfig:
nameservers:
- - 8.8.8.8
+ - 8.8.8.8
searches:
- - default.svc.cluster.local
+ - default.svc.cluster.local
containers:
- - name: kubectl
- image: "{{ $jobs.image.registry }}:{{ $jobs.image.tag }}"
- imagePullPolicy: "{{ $jobs.image.pullPolicy }}"
- command:
- - "/bin/sh"
- - "-c"
- - "sh /files/kubectl.sh"
- volumeMounts:
- - name: scripts
- mountPath: /files/kubectl.sh
- subPath: kubectl.sh
- volumes:
+ - name: kubectl
+ image: "{{ $jobs.image.registry }}:{{ $jobs.image.tag }}"
+ imagePullPolicy: "{{ $jobs.image.pullPolicy }}"
+ command:
+ - "/bin/sh"
+ - "-c"
+ - "sh /files/kubectl.sh"
+ volumeMounts:
+ - name: scripts
+ mountPath: /files/kubectl.sh
+ subPath: kubectl.sh
- name: scripts
- configMap:
- name: jobs-env
- defaultMode: 0755
+ mountPath: /files/dashboards/dubbo-resources-metrics.yaml
+ subPath: dubbo-resources-metrics.yaml
+ volumes:
+ - name: scripts
+ configMap:
+ name: jobs-env
+ defaultMode: 0755
---
apiVersion: batch/v1
kind: Job
@@ -91,26 +128,23 @@ spec:
containers:
- name: helm
image: alpine/helm:3.16.2
- imagePullPolicy: "{{ $jobs.image.pullPolicy }}"
- workingDir: "/admin"
+ imagePullPolicy: IfNotPresent
command:
- "/bin/sh"
- "-c"
- "sh /files/helm.sh"
volumeMounts:
- - name: scripts
- mountPath: /files/helm.sh
- subPath: helm.sh
- - name: dashboards
- mountPath: /files/dashboards
+ - name: scripts
+ mountPath: /files/helm.sh
+ subPath: helm.sh
+ - name: scripts
+ mountPath: /files/dashboards/dubbo-resources-metrics.yaml
+ subPath: dubbo-resources-metrics.yaml
volumes:
- - name: scripts
- configMap:
- name: jobs-env
- defaultMode: 0755
- - name: dashboards
- configMap:
- name: dashboards-config
+ - name: scripts
+ configMap:
+ name: jobs-env
+ defaultMode: 0755
---
apiVersion: v1
kind: ServiceAccount
@@ -133,6 +167,6 @@ roleRef:
kind: ClusterRole
name: cluster-admin
subjects:
- - kind: ServiceAccount
- name: helm-job-sa
- namespace: default
\ No newline at end of file
+- kind: ServiceAccount
+ name: helm-job-sa
+ namespace: default
\ No newline at end of file
