public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PackageJson: Prettify markdown/mdx on commit with lint-staged (#37616)

Browse Source 
* Format md,mdx files with prettier on lint-staged

* Manually run prettier on docs/sources
This commit is contained in:
Connor Lindsey
2021-08-06 07:52:36 -06:00
committed by GitHub
parent e9c032f10f
commit b78a67cec7
301 changed files with 3216 additions and 2980 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/sources/installation/debian.md
+11 -8
View File
@@ -20,12 +20,12 @@ You can install Grafana using our official APT repository, by downloading a `.de
If you install from the APT repository, then Grafana is automatically updated every time you run `apt-get update`.
| Grafana Version | Package | Repository |
|-----------------|---------|------------|
| Grafana OSS | grafana | `https://packages.grafana.com/oss/deb stable main` |
| Grafana OSS (Beta) | grafana | `https://packages.grafana.com/oss/deb beta main` |
| Grafana Enterprise | grafana-enterprise | `https://packages.grafana.com/enterprise/deb stable main` |
| Grafana Enterprise (Beta) | grafana-enterprise | `https://packages.grafana.com/enterprise/deb beta main` |
| Grafana Version | Package | Repository |
| ------------------------- | ------------------ | --------------------------------------------------------- |
| Grafana OSS | grafana | `https://packages.grafana.com/oss/deb stable main` |
| Grafana OSS (Beta) | grafana | `https://packages.grafana.com/oss/deb beta main` |
| Grafana Enterprise | grafana-enterprise | `https://packages.grafana.com/enterprise/deb stable main` |
| Grafana Enterprise (Beta) | grafana-enterprise | `https://packages.grafana.com/enterprise/deb beta main` |
> We recommend all users install the Enterprise Edition of Grafana, which can be seamlessly upgraded with a Grafana Enterprise [subscription](https://grafana.com/products/enterprise/?utm_source=grafana-install-page).
@@ -44,6 +44,7 @@ echo "deb https://packages.grafana.com/enterprise/deb stable main" | sudo tee -a
```
Add this repository if you want beta releases:
```bash
echo "deb https://packages.grafana.com/enterprise/deb beta main" | sudo tee -a /etc/apt/sources.list.d/grafana.list
```
@@ -70,6 +71,7 @@ echo "deb https://packages.grafana.com/oss/deb stable main" | sudo tee -a /etc/a
```
Add this repository if you want beta releases:
```bash
echo "deb https://packages.grafana.com/oss/deb beta main" | sudo tee -a /etc/apt/sources.list.d/grafana.list
```
@@ -86,8 +88,8 @@ sudo apt-get install grafana
If you install the `.deb` package, then you will need to manually update Grafana for each new version.
1. On the [Grafana download page](https://grafana.com/grafana/download), select the Grafana version you want to install.
* The most recent Grafana version is selected by default.
* The **Version** field displays only finished releases. If you want to install a beta version, click **Nightly Builds** and then select a version.
- The most recent Grafana version is selected by default.
- The **Version** field displays only finished releases. If you want to install a beta version, click **Nightly Builds** and then select a version.
1. Select an **Edition**.
- **Enterprise** - Recommended download. Functionally identical to the open source version, but includes features you can unlock with a license if you so choose.
- **Open Source** - Functionally identical to the Enterprise version, but you will need to download the Enterprise version if you want Enterprise features.
@@ -151,6 +153,7 @@ sudo update-rc.d grafana-server defaults
The `grafana-server` binary .tar.gz needs the working directory to be the root install directory where the binary and the `public` folder are located.
Start Grafana by running:
```bash
./bin/grafana-server web
```
docs/sources/installation/docker.md
+17 -12
View File
@@ -12,6 +12,7 @@ You can install and run Grafana using the official Docker image. It comes in two
This page also contains important information about [migrating from earlier Docker image versions](#migrate-from-previous-docker-containers-versions).
## Alpine image (recommended)
`grafana/grafana:<version>`
This is the default image. It's based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the Alpine official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images, and thus leads to slimmer and more secure images.
@@ -21,6 +22,7 @@ This variant is highly recommended when security and final image size being as s
> **Note:** The `grafana/grafana:<version>` image was based on [Ubuntu](https://ubuntu.com/) before version 6.4.0.
## Ubuntu image
`grafana/grafana:<version>-ubuntu`
This image is based on [Ubuntu](https://ubuntu.com/), available in [the Ubuntu official image](https://hub.docker.com/_/ubuntu). It is an alternative image for those who prefer an [Ubuntu](https://ubuntu.com/) based image and/or are dependent on certain tooling not available for Alpine.
@@ -28,6 +30,7 @@ This image is based on [Ubuntu](https://ubuntu.com/), available in [the Ubuntu o
> **Note:** The `grafana/grafana:<version>-ubuntu` image is available for Grafana version 6.5.0 and later.
## Run Grafana
You can run the latest Grafana version, run a specific version, or run an unstable version based on the main branch of the [grafana/grafana GitHub repository](https://github.com/grafana/grafana).
### Run the latest stable version of Grafana
@@ -47,15 +50,16 @@ docker run -d -p 3000:3000 --name grafana grafana/grafana:<version number>
```
**Example:**
```bash
docker run -d -p 3000:3000 --name grafana grafana/grafana:6.5.0
```
### Run the Grafana main branch
For every successful build of the main branch, we update the `grafana/grafana:main` and `grafana/grafana:main-ubuntu` tags. Additionally, two new tags are created, `grafana/grafana-dev:<version>-<build ID>pre` and `grafana/grafana-dev:<version>-<build ID>pre-ubuntu`, where *version* is the next version of Grafana and *build ID* is the ID of the corresponding CI build. Use these to get access to the latest main builds of Grafana.
For every successful build of the main branch, we update the `grafana/grafana:main` and `grafana/grafana:main-ubuntu` tags. Additionally, two new tags are created, `grafana/grafana-dev:<version>-<build ID>pre` and `grafana/grafana-dev:<version>-<build ID>pre-ubuntu`, where _version_ is the next version of Grafana and _build ID_ is the ID of the corresponding CI build. Use these to get access to the latest main builds of Grafana.
When running Grafana main in production, we *strongly* recommend that you use the `grafana/grafana-dev:<version>-<build ID>pre` tag. This tag guarantees that you use a specific version of Grafana instead of whatever was the most recent commit at the time.
When running Grafana main in production, we _strongly_ recommend that you use the `grafana/grafana-dev:<version>-<build ID>pre` tag. This tag guarantees that you use a specific version of Grafana instead of whatever was the most recent commit at the time.
For a list of available tags, check out [grafana/grafana](https://hub.docker.com/r/grafana/grafana/tags/) and [grafana/grafana-dev](https://hub.docker.com/r/grafana/grafana-dev/tags/).
@@ -91,7 +95,7 @@ docker run -d \
grafana/grafana
```
## Build and run a Docker image with pre-installed plugins
## Build and run a Docker image with pre-installed plugins
You can build your own customized image that includes plugins. This saves time if you are creating multiple images and you want them all to have the same plugins installed on build.
@@ -102,6 +106,7 @@ In the [Grafana GitHub repository](https://github.com/grafana/grafana) there is
> If you need to specify the version of a plugin, you can add it to the `GF_INSTALL_PLUGINS` build argument. Otherwise, the latest will be assumed. For example: `--build-arg "GF_INSTALL_PLUGINS=grafana-clock-panel 1.0.1,grafana-simple-json-datasource 1.3.5"`
Example of how to build and run:
```bash
cd packaging/docker/custom
docker build \
@@ -135,6 +140,7 @@ Replace `Dockerfile` in above example with `ubuntu.Dockerfile` to build a custom
The [Grafana Image Renderer plugin]({{< relref "../administration/image_rendering/#grafana-image-renderer-plugin" >}}) does not currently work if it is installed in a Grafana Docker image. You can build a custom Docker image by using the `GF_INSTALL_IMAGE_RENDERER_PLUGIN` build argument. This installs additional dependencies needed for the Grafana Image Renderer plugin to run.
Example of how to build and run:
```bash
cd packaging/docker/custom
docker build \
@@ -159,7 +165,6 @@ The Grafana Docker image runs with the `root` group (id 0) instead of the `grafa
Grafana Docker image now comes in two variants, one [Alpine](http://alpinelinux.org) based and one [Ubuntu](https://ubuntu.com/) based, see [Image Variants](#image-variants) for details.
### Migrate to v6.4 or later
Grafana Docker image was changed to be based on [Alpine](http://alpinelinux.org) instead of [Ubuntu](https://ubuntu.com/).
@@ -189,11 +194,11 @@ You should always be careful to define your own named volume for storage, but if
In Grafana v5.1, we changed the ID and group of the Grafana user and in v7.3 we changed the group. Unfortunately this means that files created prior to v5.1 won't have the correct permissions for later versions. We made this change so that it would be more likely that the Grafana users ID would be unique to Grafana. For example, on Ubuntu 16.04 `104` is already in use by the syslog user.
Version | User | User ID | Group | Group ID
--------|---------|---------|---------|---------
< 5.1 | grafana | 104 | grafana | 107
\>= 5.1 | grafana | 472 | grafana | 472
\>= 7.3 | grafana | 472 | root | 0
| Version | User | User ID | Group | Group ID |
| ------- | ------- | ------- | ------- | -------- |
| < 5.1 | grafana | 104 | grafana | 107 |
| \>= 5.1 | grafana | 472 | grafana | 472 |
| \>= 7.3 | grafana | 472 | root | 0 |
There are two possible solutions to this problem. Either you start the new container as the root user and change ownership from `104` to `472`, or you start the upgraded container as user `104`.
@@ -204,15 +209,16 @@ docker run --user 104 --volume "<your volume mapping here>" grafana/grafana:5.1.
```
##### Specify a user in docker-compose.yml
```yaml
version: "2"
version: '2'
services:
grafana:
image: grafana/grafana:5.1.0
ports:
- 3000:3000
user: "104"
user: '104'
```
#### Modify permissions
@@ -240,4 +246,3 @@ Refer to [Configure a Grafana Docker image]({{< relref "../administration/config
## Configure Grafana
Refer to the [Configuration]({{< relref "../administration/configuration.md" >}}) page for details on options for customizing your environment, logging, database, and so on.
docs/sources/installation/kubernetes.md
+29 -18
View File
@@ -7,12 +7,13 @@ weight = 700
## Deploy Grafana on Kubernetes
This page explains how to install and run Grafana on Kubernetes (K8S). It uses Kubernetes manifests for the setup. If you prefer Helm, refer to the [Grafana Helm community charts](https://github.com/grafana/helm-charts).
This page explains how to install and run Grafana on Kubernetes (K8S). It uses Kubernetes manifests for the setup. If you prefer Helm, refer to the [Grafana Helm community charts](https://github.com/grafana/helm-charts).
If you are interested in Grafana Enterprise (not Grafana OS), jump to [Deploy Grafana Enterprise on Kubernetes](#deploy-grafana-enterprise-on-kubernetes) section.
### Create Grafana Kubernetes manifest
1. Create a file called `grafana.yaml`, then paste the contents below.
1. Create a file called `grafana.yaml`, then paste the contents below.
```yaml
---
@@ -45,7 +46,7 @@ spec:
securityContext:
fsGroup: 472
supplementalGroups:
- 0
- 0
containers:
- name: grafana
image: grafana/grafana:7.5.2
@@ -71,7 +72,7 @@ spec:
successThreshold: 1
tcpSocket:
port: 3000
timeoutSeconds: 1
timeoutSeconds: 1
resources:
requests:
cpu: 250m
@@ -99,34 +100,40 @@ spec:
type: LoadBalancer
```
### Send manifest to Kubernetes API server
1. Run the following command:
`kubectl apply -f grafana.yaml`
1. Run the following command:
`kubectl apply -f grafana.yaml`
1. Check that it worked by running the following:
`kubectl port-forward service/grafana 3000:3000`
`kubectl port-forward service/grafana 3000:3000`
1. Navigate to `localhost:3000` in your browser. You should see a Grafana login page.
1. Navigate to `localhost:3000` in your browser. You should see a Grafana login page.
1. Use `admin` for both the username and password to login.
## Deploy Grafana Enterprise on Kubernetes
The process for deploying Grafana Enterprise is almost identical to the process above, except for some extra steps required to add in your license file. They are described in the following sections.
### Obtain Grafana Enterprise license
To run Grafana Enterprise, you need a valid license. [Contact a Grafana Labs representative](https://grafana.com/contact?about=grafana-enterprise) to obtain the license. This topic assumes that you already have done this and have a `license.jwt` file. Your license should also be associated with a URL, which we will use later in the topic.
To run Grafana Enterprise, you need a valid license. [Contact a Grafana Labs representative](https://grafana.com/contact?about=grafana-enterprise) to obtain the license. This topic assumes that you already have done this and have a `license.jwt` file. Your license should also be associated with a URL, which we will use later in the topic.
### Create License Secret
Create a Kubernetes secret from your license file using the following command:
```bash
kubectl create secret generic ge-license --from-file=/path/to/your/license.jwt
```
### Create Grafana Enterprise configuration
Create a Grafana configuration file with the name `grafana.ini`. Then paste the content below.
>**Note:** You will have to update the `root_url` field to the url associated with the license you were given.
Create a Grafana configuration file with the name `grafana.ini`. Then paste the content below.
> **Note:** You will have to update the `root_url` field to the url associated with the license you were given.
```yaml
[enterprise]
license_path = /etc/grafana/license/license.jwt
@@ -136,12 +143,16 @@ root_url =/your/license/root/url
```
### Create Configmap for Grafana Enterprise Config
Create a Kubernetes Configmap from your `grafana.ini` file with the following command:
```bash
kubectl create configmap ge-config --from-file=/path/to/your/config.ini
```
### Create Grafana Enterprise Kubernetes manifest
Create a `grafana.yaml` file, then paste the content below. This YAML is identical to the one for Grafana OS install except for the additional references to the Configmap which has your Grafana configuration file and the Secret that has your license.
Create a `grafana.yaml` file, then paste the content below. This YAML is identical to the one for Grafana OS install except for the additional references to the Configmap which has your Grafana configuration file and the Secret that has your license.
```yaml
---
@@ -228,14 +239,14 @@ spec:
sessionAffinity: None
type: LoadBalancer
```
1. Send manifest to Kubernetes API Server
`kubectl apply -f grafana.yaml`
`kubectl apply -f grafana.yaml`
1. Check that it worked by running the following:
`kubectl port-forward service/grafana 3000:3000`
`kubectl port-forward service/grafana 3000:3000`
1. Navigate to `localhost:3000` in your browser. You should see the Grafana login page.
1. Navigate to `localhost:3000` in your browser. You should see the Grafana login page.
1. Use `admin` for both the username and password to login.
If it worked, you should see `Enterprise (Licensed)` at the bottom of the page.
If it worked, you should see `Enterprise (Licensed)` at the bottom of the page.
docs/sources/installation/mac.md
+11 -10
View File
@@ -17,7 +17,8 @@ Use [Homebrew](http://brew.sh/) to install the most recent released version of G
1. On the Homebrew homepage, search for Grafana. The last stable and released version is listed.
1. Open a terminal and enter:
```
```
brew update
brew install grafana
```
@@ -31,25 +32,25 @@ Use [Homebrew](http://brew.sh/) to install the most recent released version of G
## Install standalone macOS binaries
To install a nightly build, or to install the latest version of Grafana without Homebrew, go to the [Grafana download page](https://grafana.com/grafana/download/7.3.0-381ff45epre?platform=mac).
To install a nightly build, or to install the latest version of Grafana without Homebrew, go to the [Grafana download page](https://grafana.com/grafana/download/7.3.0-381ff45epre?platform=mac).
1. Select the Grafana version you want to install. By default, the most recent released version is selected.
> **Note:** The downloads page lists only finished releases. If you want to install a beta version, click [Nightly ] **Nightly Builds** and then select a version.
1. Select an **Edition**.
* **Open Source** - Functionally identical to the enterprise version, but you will need to download the enterprise version if you want enterprise features.
* **Enterprise** - Recommended download. Functionally identical to the open source version, but includes features you can unlock with a license if you so choose.
- **Open Source** - Functionally identical to the enterprise version, but you will need to download the enterprise version if you want enterprise features.
- **Enterprise** - Recommended download. Functionally identical to the open source version, but includes features you can unlock with a license if you so choose.
1. Click **Mac**.
1. Open a terminal and download the binary using the cURL command. The following example shows Grafana 7.1.5 version:
```bash
curl -O https://dl.grafana.com/oss/release/grafana-7.1.5.darwin-amd64.tar.gz
```
1. Untar the gz file and copy the files to the location of your preference.
1. To start Grafana service, go to the directory and run the command:
```bash
./bin/grafana-server web
```
```
1. Untar the gz file and copy the files to the location of your preference.
1. To start Grafana service, go to the directory and run the command:
```bash
./bin/grafana-server web
```
## Next steps
docs/sources/installation/restart-grafana.md
+3
View File
@@ -33,6 +33,7 @@ Use the [Homebrew](http://brew.sh/) restart command:
```bash
brew services restart grafana
```
### Restart standalone macOS binaries
To restart Grafana:
@@ -43,6 +44,7 @@ To restart Grafana:
```bash
./bin/grafana-server web
```
## Linux
Restart methods differ depending on whether your Linux system uses `systemd` or `init.d`.
@@ -95,6 +97,7 @@ Alternately, you can configure the Grafana server to restart at boot:
```bash
sudo update-rc.d grafana-server defaults
```
## Docker
To restart the Grafana service, use the `docker restart` command.
docs/sources/installation/rpm.md
+11 -9
View File
@@ -12,7 +12,6 @@ This page explains how to install Grafana dependencies, download and install Gra
**Note on upgrading:** While the process for upgrading Grafana is very similar to installing Grafana, there are some key backup steps you should perform. Read [Upgrading Grafana]({{< relref "upgrading.md" >}}) for tips and guidance on updating an existing installation.
## 1. Download and install
You can install Grafana from a YUM repository, manually using YUM, manually using RPM, or by downloading a binary `.tar.gz` file.
@@ -21,13 +20,12 @@ You can install Grafana from a YUM repository, manually using YUM, manually usin
If you install from the YUM repository, then Grafana is automatically updated every time you run `sudo yum update`.
| Grafana Version | Package | Repository |
|----------------------------|--------------------|----------------------------------------------------|
| Grafana OSS | grafana | `https://packages.grafana.com/oss/rpm` |
| Grafana OSS (Beta) | grafana | `https://packages.grafana.com/oss/rpm-beta` |
| Grafana Enterprise | grafana-enterprise | `https://packages.grafana.com/enterprise/rpm` |
| Grafana Enterprise (Beta) | grafana-enterprise | `https://packages.grafana.com/enterprise/rpm-beta` |
| Grafana Version | Package | Repository |
| ------------------------- | ------------------ | -------------------------------------------------- |
| Grafana OSS | grafana | `https://packages.grafana.com/oss/rpm` |
| Grafana OSS (Beta) | grafana | `https://packages.grafana.com/oss/rpm-beta` |
| Grafana Enterprise | grafana-enterprise | `https://packages.grafana.com/enterprise/rpm` |
| Grafana Enterprise (Beta) | grafana-enterprise | `https://packages.grafana.com/enterprise/rpm-beta` |
Add a new file to your YUM repo using the method of your choice. The command below uses `nano`.
@@ -40,6 +38,7 @@ Choose if you want to install the Open Source or Enterprise edition of Grafana a
> We recommend all users to install the Enterprise Edition of Grafana, which can be seamlessly upgraded with a Grafana Enterprise [subscription](https://grafana.com/products/enterprise/?utm_source=grafana-install-page).
For Enterprise releases:
```bash
[grafana]
name=grafana
@@ -53,6 +52,7 @@ sslcacert=/etc/pki/tls/certs/ca-bundle.crt
```
For OSS releases:
```bash
[grafana]
name=grafana
@@ -92,7 +92,8 @@ If you install manually with YUM, then you will need to manually update Grafana
wget <rpm package url>
sudo yum localinstall <local rpm package>
```
You can also install Grafana using YUM directly:
You can also install Grafana using YUM directly:
```bash
sudo yum install <rpm package url>
@@ -181,6 +182,7 @@ sudo /sbin/chkconfig --add grafana-server
The `grafana-server` binary needs the working directory to be the root install directory where the binary and the `public` folder are located.
Start Grafana by running:
```bash
./bin/grafana-server web
```
docs/sources/installation/upgrading.md
+10 -8
View File
@@ -15,6 +15,7 @@ Upgrading is generally safe (between many minor and one major version) and dashb
## Backup
We recommend that you backup a few things in case you have to rollback the upgrade.
- Installed plugins - Back them up before you upgrade them in case you want to rollback the Grafana version and want to get the exact same versions you were running before the upgrade.
- Configuration files do not need to be backed up. However, you might want to in case you add new configuration options after upgrade and then rollback.
@@ -47,6 +48,7 @@ backup:
restore:
> psql grafana < grafana_backup
```
### Ubuntu or Debian
You can upgrade Grafana by following the same procedure as when you installed it.
@@ -170,10 +172,10 @@ will keep working with unencrypted passwords. If you want to migrate to encrypte
you can do that by:
- For data sources created through UI, you need to go to data source config, re-enter the password or basic auth
password and save the data source.
password and save the data source.
- For data sources created by provisioning, you need to update your config file and use secureJsonData.password or
secureJsonData.basicAuthPassword field. See [provisioning docs]({{< relref "../administration/provisioning" >}}) for example of current
configuration.
secureJsonData.basicAuthPassword field. See [provisioning docs]({{< relref "../administration/provisioning" >}}) for example of current
configuration.
### Embedding Grafana
@@ -243,7 +245,7 @@ A global minimum dashboard refresh interval is now enforced and defaults to 5 se
### Backend plugins
Grafana now requires backend plugins to be signed. If a backend plugin is not signed Grafana will not load/start it. This is an additional security measure to make sure backend plugin binaries and files haven't been tampered with. All Grafana Labs authored backend plugins, including Enterprise plugins, are now signed. It's possible to allow unsigned plugins using a configuration setting, but is something we strongly advise against doing. For more information about this setting, refer to [allow loading unsigned plugins]({{< relref "../administration/#allow_loading_unsigned_plugins" >}}).
Grafana now requires backend plugins to be signed. If a backend plugin is not signed Grafana will not load/start it. This is an additional security measure to make sure backend plugin binaries and files haven't been tampered with. All Grafana Labs authored backend plugins, including Enterprise plugins, are now signed. It's possible to allow unsigned plugins using a configuration setting, but is something we strongly advise against doing. For more information about this setting, refer to [allow loading unsigned plugins]({{< relref "../administration/#allow_loading_unsigned_plugins" >}}).
### Cookie path
@@ -256,6 +258,7 @@ Starting from Grafana v7.0.0, the cookie path does not include the trailing slas
Before Grafana v7.2 alert notification channels did not store sensitive settings/secrets such as API tokens and password encrypted in the database. In Grafana v7.2, creating a new alert notification channel will store sensitive settings encrypted in the database.
The following alert notifiers have been updated to support storing their sensitive settings encrypted:
- Slack (URL and Token)
- Pagerduty (Integration Key)
- Webhook (Password)
@@ -294,7 +297,7 @@ For more information and details, please refer to [Using AWS CloudWatch in Grafa
### User invites database migration
The database table _temp\_user_, that tracks user invites, is subject to a database migration that changes the data type of the _created_ and _updated_ columns:
The database table _temp_user_, that tracks user invites, is subject to a database migration that changes the data type of the _created_ and _updated_ columns:
| Database | Old data type | New data type |
| -------- | ------------- | ------------- |
@@ -306,12 +309,12 @@ The database table _temp\_user_, that tracks user invites, is subject to a datab
### Snapshots database migration
The database table _dashboard\_snapshot_, that stores dashboard snapshots, adds a new column _dashboard\_encrypted_ for storing an encrypted snapshot.
The database table _dashboard_snapshot_, that stores dashboard snapshots, adds a new column _dashboard_encrypted_ for storing an encrypted snapshot.
NOTE: Only snapshots created on Grafana 7.3 or later will use this column to store snapshot data as encrypted. Snapshots created before this version will be unaffected and remain unencrypted.
### Use of the root group in the Docker images
The Grafana Docker images use the `root` group instead of the `grafana` group. This change can cause builds to break for users who extend the Grafana Docker image. Learn more about this change in the [Docker migration instructions]({{< relref "docker/#migrate-to-v73-or-later">}})
The Grafana Docker images use the `root` group instead of the `grafana` group. This change can cause builds to break for users who extend the Grafana Docker image. Learn more about this change in the [Docker migration instructions]({{< relref "docker/#migrate-to-v73-or-later">}})
## Upgrading to v7.5
@@ -342,5 +345,4 @@ Refer to [Grafana Live configuration]({{< relref "../live/configure-grafana-live
Grafana v8.0 changes the underlying data structure to [data frames]({{< relref "../developers/plugins/data-frames.md" >}}) for the Postgres, MySQL, Microsoft SQL Server data sources. As a result, a _Time series_ query result gets returned in a [wide format]({{< relref "../developers/plugins/data-frames.md#wide-format" >}}). To make the visualizations work as they did before, you might have to do some manual migrations.
For any existing panels/visualizations using a _Time series_ query, where the time column is only needed for filtering the time range, for example, using the bar gauge or pie chart panel, we recommend that you use a _Table query_ instead and exclude the time column as a field in the response.
Refer to this [issue comment](https://github.com/grafana/grafana/issues/35534#issuecomment-861519658) for detailed instructions and workarounds.
docs/sources/installation/windows.md
+3 -3
View File
@@ -38,12 +38,12 @@ To run Grafana, open your browser and go to the Grafana port (http://localhost:3
1. Extract this folder to anywhere you want Grafana to run from.
1. Start Grafana by executing `grafana-server.exe`, located in the `bin` directory, preferably from the command line. If you want to run Grafana as a Windows service, then download
[NSSM](https://nssm.cc/). It is very easy to add Grafana as a Windows service using that tool.
[NSSM](https://nssm.cc/). It is very easy to add Grafana as a Windows service using that tool.
To run Grafana, open your browser and go to the Grafana port (http://localhost:3000/ is default) and then follow the instructions in [Getting Started]({{< relref "../getting-started/getting-started/" >}}).
> **Note:** The default Grafana port is `3000`. This port might require extra permissions on Windows. If it does not appear in the default port, you can try changing to a different port.
>
> 1. Go into the `conf` directory and copy `sample.ini` to `custom.ini`. **Note:** You should edit `custom.ini`, never `defaults.ini`.
> 1. Go into the `conf` directory and copy `sample.ini` to `custom.ini`. **Note:** You should edit `custom.ini`, never `defaults.ini`.
> 1. Edit `custom.ini` and uncomment the `http_port` configuration option (`;` is the comment character in ini files) and change it to something like `8080` or similar. That port should not require extra Windows privileges.
> Read more about the [configuration options]({{< relref "../administration/configuration.md" >}}).
> Read more about the [configuration options]({{< relref "../administration/configuration.md" >}}).