Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

doc: fix grafana version 6.11.0 #865

Merged
merged 1 commit into from
Sep 25, 2023
Merged

doc: fix grafana version 6.11.0 #865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 8 additions & 5 deletions hack/local-env-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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 "
Expand Down
10 changes: 4 additions & 6 deletions site/content/en/docs/Getting started/Installation/installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}}

Expand Down
10 changes: 4 additions & 6 deletions site/content/zh/docs/Getting started/Installation/installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}}

Expand Down