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

Helm chart: Update grafana install instructions #2943

Closed
wants to merge 1 commit into from
Closed

Helm chart: Update grafana install instructions #2943

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions docs/sources/installation/helm.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ title: Helm

## Prerequisites

Make sure you have Helm [installed](https://helm.sh/docs/using_helm/#installing-helm) and
[deployed](https://helm.sh/docs/using_helm/#installing-tiller) to your cluster.
Make sure you have Helm 3 [installed](https://helm.sh/docs/intro/install/).

Add [Loki's chart repository](https://github.com/grafana/loki/tree/master/production/helm/loki) to Helm:

Expand Down Expand Up @@ -64,7 +63,7 @@ helm upgrade --install loki loki/loki-stack \
To install Grafana on your cluster with Helm, use the following command:

```bash
helm install stable/grafana -n loki-grafana
helm upgrade --install loki loki/loki-stack --set grafana.enabled=true
```

To get the admin password for the Grafana pod, run the following command:
Expand All @@ -79,8 +78,9 @@ To access the Grafana UI, run the following command:
kubectl port-forward --namespace <YOUR-NAMESPACE> service/loki-grafana 3000:80
```

Navigate to `http://localhost:3000` and login with `admin` and the password
output above. Then follow the [instructions for adding the Loki Data Source](../../getting-started/grafana/), using the URL
Navigate to `http://localhost:3000` and login with `admin` and the
password output above. Loki is added as a [Data
Source](../../getting-started/grafana/) automatically using URL
`http://loki:3100/` for Loki.

## Run Loki behind HTTPS ingress
Expand Down
16 changes: 7 additions & 9 deletions production/helm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

## Prerequisites

Make sure you have Helm [installed](https://helm.sh/docs/using_helm/#installing-helm) and
[deployed](https://helm.sh/docs/using_helm/#installing-tiller) to your cluster. Then add
Make sure you have Helm 3
[installed](https://helm.sh/docs/intro/install/). Then add
Loki's chart repository to Helm:

```bash
Expand Down Expand Up @@ -84,11 +84,7 @@ $ helm upgrade --install loki loki/loki-stack \
To install Grafana on your cluster with helm, use the following command:

```bash
# with Helm 2
$ helm install stable/grafana -n loki-grafana --namespace <YOUR-NAMESPACE>

# with Helm 3
$ helm install loki-grafana stable/grafana -n <YOUR-NAMESPACE>
helm upgrade --install loki loki/loki-stack --set grafana.enabled=true
```

> The chart loki-stack contains a pre-configured Grafana, simply use `--set grafana.enabled=true`
Expand All @@ -105,8 +101,10 @@ To access the Grafana UI, run the following command:
$ kubectl port-forward --namespace <YOUR-NAMESPACE> service/loki-grafana 3000:80
```

Navigate to http://localhost:3000 and login with `admin` and the password output above.
Then follow the [instructions for adding the loki datasource](/docs/getting-started/grafana.md), using the URL `http://loki:3100/`.
Navigate to `http://localhost:3000` and login with `admin` and the
password output above. Loki is added as a [Data
Source](../../getting-started/grafana/) automatically using URL
`http://loki:3100/` for Loki.

## Run Loki behind https ingress

Expand Down