doc: fix grafana version 6.11.0

gocrane · Sep 25, 2023 · 0068048 · 0068048
1 parent 94616ca
commit 0068048
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/hack/local-env-setup.sh b/hack/local-env-setup.sh
@@ -40,6 +40,7 @@ PROMETHEUS_HELM_URL="https://prometheus-community.github.io/helm-charts"
 PROMETHEUS_VALUE_URL="https://raw.githubusercontent.com/gocrane/helm-charts/main/integration/prometheus/override_values.yaml"
 GRAFANA_HELM_NAME="grafana"
 GRAFANA_HELM_URL="https://grafana.github.io/helm-charts"
+GRAFANA_HELM_PACKAGE_URL="https://github.com/grafana/helm-charts/releases/download/grafana-6.11.0/grafana-6.11.0.tgz"
 GRAFANA_VALUE_URL="https://raw.githubusercontent.com/gocrane/helm-charts/main/integration/grafana/override_values.yaml"
 CRANE_HELM_NAME="crane"
 CRANE_HELM_URL="https://gocrane.github.io/helm-charts"
@@ -52,6 +53,7 @@ if [ "$FROM_MIRROR" = true ]; then
   PROMETHEUS_VALUE_URL="https://gitee.com/finops/helm-charts/raw/main/integration/prometheus/override_values.yaml"
   GRAFANA_HELM_NAME="grafana-gocrane"
   GRAFANA_HELM_URL="https://finops-helm.pkg.coding.net/gocrane/grafana"
+  GRAFANA_HELM_PACKAGE_URL="https://finops-generic.pkg.coding.net/gocrane/generic/grafana-6.11.0.tgz\?version\=latest"
   GRAFANA_VALUE_URL="https://gitee.com/finops/helm-charts/raw/main/integration/grafana/override_values.yaml"
   CRANE_HELM_NAME="crane-mirror"
   CRANE_HELM_URL="https://finops-helm.pkg.coding.net/gocrane/gocrane"
@@ -74,11 +76,12 @@ helm install prometheus -n crane-system --version 19.6.1 \
 echo "Step2: Installing Prometheus finished."
 
 echo "Step3: Installing Grafana "
-helm repo add ${GRAFANA_HELM_NAME} ${GRAFANA_HELM_URL}
-helm install grafana --version 6.11.0 \
-             -f ${GRAFANA_VALUE_URL} \
-             -n crane-system \
-             --create-namespace ${GRAFANA_HELM_NAME}/grafana
+
+helm install grafana  \                
+    -f ${GRAFANA_VALUE_URL} \
+    -n crane-system \
+    --create-namespace ${GRAFANA_HELM_PACKAGE_URL}
+
 echo "Step3: Installing Grafana finished."
 
 echo "Step4: Installing Crane "

diff --git a/site/content/en/docs/Getting started/Installation/installation.md b/site/content/en/docs/Getting started/Installation/installation.md
@@ -59,18 +59,16 @@ Fadvisor use grafana to present cost estimates. Using following command to insta
 
 {{< tabpane right=true >}}
 {{< tab header="Main" lang="en" >}}
-helm repo add grafana https://grafana.github.io/helm-charts
-helm install grafana --version 6.11.0 \
+helm install grafana \
     -f https://raw.githubusercontent.com/gocrane/helm-charts/main/integration/grafana/override_values.yaml \
     -n crane-system \
-    --create-namespace grafana/grafana
+    --create-namespace https://github.com/grafana/helm-charts/releases/download/grafana-6.11.0/grafana-6.11.0.tgz
 {{< /tab >}}
 {{< tab header="Mirror" lang="en" >}}
-helm repo add grafana https://finops-helm.pkg.coding.net/gocrane/grafana
-helm install grafana --version 6.11.0 \
+helm install grafana \
     -f https://gitee.com/finops/helm-charts/raw/main/integration/grafana/override_values.yaml \
     -n crane-system \
-    --create-namespace grafana/grafana
+    --create-namespace https://finops-generic.pkg.coding.net/gocrane/generic/grafana-6.11.0.tgz\?version\=latest
 {{< /tab >}}
 {{% /tabpane %}}
 

diff --git a/site/content/zh/docs/Getting started/Installation/installation.md b/site/content/zh/docs/Getting started/Installation/installation.md
@@ -69,18 +69,16 @@ Crane 的 Fadvisor 使用 Grafana 展示成本预估。安装 Grafana：
 
 {{< tabpane right=true >}}
 {{< tab header="Main" lang="en" >}}
-helm repo add grafana https://grafana.github.io/helm-charts
-helm install grafana --version 6.11.0 \
+helm install grafana  \
     -f https://raw.githubusercontent.com/gocrane/helm-charts/main/integration/grafana/override_values.yaml \
     -n crane-system \
-    --create-namespace grafana/grafana
+    --create-namespace https://github.com/grafana/helm-charts/releases/download/grafana-6.11.0/grafana-6.11.0.tgz
 {{< /tab >}}
 {{< tab header="Mirror" lang="en" >}}
-helm repo add grafana https://finops-helm.pkg.coding.net/gocrane/grafana
-helm install grafana --version 6.11.0 \
+helm install grafana  \
     -f https://gitee.com/finops/helm-charts/raw/main/integration/grafana/override_values.yaml \
     -n crane-system \
-    --create-namespace grafana/grafana
+    --create-namespace https://finops-generic.pkg.coding.net/gocrane/generic/grafana-6.11.0.tgz\?version\=latest
 {{< /tab >}}
 {{% /tabpane %}}