Docs: Fix operating system names (#19638)
* Docs: Replace "linux" with "Linux" * Docs: Replace "windows" with "Windows" * Docs: Replace "Mac/OSX/Mac OS X/MacOS" with "macOS" * Docs: Replace "unix/UNIX" with "Unix"
This commit is contained in:
Linus Groh
committed by
Marcus Olsson
Marcus Olsson
parent
f2089bab31
commit
d9257aa38a
@@ -15,7 +15,7 @@ weight = 1
|
||||
- [Requirements](requirements)
|
||||
- [Installing on Debian / Ubuntu](debian)
|
||||
- [Installing on RPM-based Linux (CentOS, Fedora, OpenSuse, RedHat)](rpm)
|
||||
- [Installing on Mac OS X](mac)
|
||||
- [Installing on macOS](mac)
|
||||
- [Installing on Windows](windows)
|
||||
- [Installing on Docker](docker)
|
||||
- [Installing using Provisioning (Chef, Puppet, Salt, Ansible, etc)](provisioning)
|
||||
|
||||
@@ -214,9 +214,9 @@ will be stored.
|
||||
|
||||
### host
|
||||
|
||||
Only applicable to MySQL or Postgres. Includes IP or hostname and port or in case of unix sockets the path to it.
|
||||
Only applicable to MySQL or Postgres. Includes IP or hostname and port or in case of Unix sockets the path to it.
|
||||
For example, for MySQL running on the same host as Grafana: `host =
|
||||
127.0.0.1:3306` or with unix sockets: `host = /var/run/mysqld/mysqld.sock`
|
||||
127.0.0.1:3306` or with Unix sockets: `host = /var/run/mysqld/mysqld.sock`
|
||||
|
||||
### name
|
||||
|
||||
@@ -238,7 +238,7 @@ For MySQL, use either `true`, `false`, or `skip-verify`.
|
||||
|
||||
### ca_cert_path
|
||||
|
||||
The path to the CA certificate to use. On many linux systems, certs can be found in `/etc/ssl/certs`.
|
||||
The path to the CA certificate to use. On many Linux systems, certs can be found in `/etc/ssl/certs`.
|
||||
|
||||
### client_key_path
|
||||
|
||||
@@ -739,7 +739,7 @@ session provider you have configured.
|
||||
- **mysql:** go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1:3306)/database_name`
|
||||
- **postgres:** ex: `user=a password=b host=localhost port=5432 dbname=c sslmode=verify-full`
|
||||
- **memcache:** ex: `127.0.0.1:11211`
|
||||
- **redis:** ex: `addr=127.0.0.1:6379,pool_size=100,prefix=grafana`. For unix socket, use for example: `network=unix,addr=/var/run/redis/redis.sock,pool_size=100,db=grafana`
|
||||
- **redis:** ex: `addr=127.0.0.1:6379,pool_size=100,prefix=grafana`. For Unix socket, use for example: `network=unix,addr=/var/run/redis/redis.sock,pool_size=100,db=grafana`
|
||||
|
||||
Postgres valid `sslmode` are `disable`, `require`, `verify-ca`, and `verify-full` (default).
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
+++
|
||||
title = "Installing on Mac"
|
||||
description = "Installing Grafana on Mac"
|
||||
title = "Installing on macOS"
|
||||
description = "Installing Grafana on macOS"
|
||||
keywords = ["grafana", "configuration", "documentation", "mac", "homebrew", "osx"]
|
||||
type = "docs"
|
||||
[menu.docs]
|
||||
@@ -9,7 +9,7 @@ weight = 4
|
||||
+++
|
||||
|
||||
|
||||
# Installing on Mac
|
||||
# Installing on macOS
|
||||
|
||||
## Install using homebrew
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ This page includes useful information on the supported Operating Systems as well
|
||||
|
||||
- [Debian / Ubuntu](/installation/debian)
|
||||
- [RPM-based Linux (CentOS, Fedora, OpenSuse, RedHat)](/installation/rpm)
|
||||
- [Mac OS X](/installation/mac)
|
||||
- [macOS](/installation/mac)
|
||||
- [Windows](/installation/windows)
|
||||
|
||||
### Unsupported
|
||||
|
||||
@@ -27,7 +27,7 @@ older versions of Grafana read the [how troubleshoot metric query issue](https:/
|
||||
## Logging
|
||||
|
||||
If you encounter an error or problem it is a good idea to check the grafana server log. Usually
|
||||
located at `/var/log/grafana/grafana.log` on unix systems or in `<grafana_install_dir>/data/log` on
|
||||
located at `/var/log/grafana/grafana.log` on Unix systems or in `<grafana_install_dir>/data/log` on
|
||||
other platforms and manual installs.
|
||||
|
||||
You can enable more logging by changing log level in you grafana configuration file.
|
||||
|
||||
@@ -34,7 +34,7 @@ Before upgrading it can be a good idea to backup your Grafana database. This wil
|
||||
|
||||
#### sqlite
|
||||
|
||||
If you use sqlite you only need to make a backup of your `grafana.db` file. This is usually located at `/var/lib/grafana/grafana.db` on unix system.
|
||||
If you use sqlite you only need to make a backup of your `grafana.db` file. This is usually located at `/var/lib/grafana/grafana.db` on Unix systems.
|
||||
If you are unsure what database you use and where it is stored check you grafana configuration file. If you
|
||||
installed grafana to custom location using a binary tar/zip it is usually in `<grafana_install_dir>/data`.
|
||||
|
||||
@@ -100,7 +100,7 @@ docker run --name=my-grafana-container --restart=always -v /var/lib/grafana:/var
|
||||
|
||||
### Windows
|
||||
|
||||
If you downloaded the windows binary package you can just download a newer package and extract
|
||||
If you downloaded the Windows binary package you can just download a newer package and extract
|
||||
to the same location (and overwrite the existing files). This might overwrite your config changes. We
|
||||
recommend you place your config changes in a file named `<grafana_install_dir>/conf/custom.ini`
|
||||
as this will make upgrades easier without risking losing your config changes.
|
||||
|
||||
@@ -27,7 +27,7 @@ this folder to anywhere you want Grafana to run from. Go into the
|
||||
`custom.ini`, never `defaults.ini`.
|
||||
|
||||
The default Grafana port is `3000`, this port requires extra permissions
|
||||
on windows. Edit `custom.ini` and uncomment the `http_port`
|
||||
on Windows. 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.
|
||||
|
||||
@@ -35,7 +35,7 @@ Default login and password `admin`/ `admin`
|
||||
|
||||
|
||||
Start Grafana by executing `grafana-server.exe`, located in the `bin` directory, preferably from the
|
||||
command line. If you want to run Grafana as windows service, download
|
||||
command line. If you want to run Grafana as Windows service, download
|
||||
[NSSM](https://nssm.cc/). It is very easy to add Grafana as a Windows
|
||||
service using that tool.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user