diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md old mode 100755 new mode 100644 index dc522a07ee0..968ef1149d3 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -32,7 +32,7 @@ If you installed Grafana using the `deb` or `rpm` packages, then your configurat `sample.ini` is in the same directory as `defaults.ini` and contains all the settings commented out. Copy `sample.ini` and name it `custom.ini`. **macOS** -By default, the configuration file is located at `/usr/local/etc/grafana/grafana.ini`. +By default, the configuration file is located at `/usr/local/etc/grafana/grafana.ini`. To configure Grafana, add a configuration file named `custom.ini` to the `conf` folder to override any of the settings defined in `conf/defaults.ini`. ## Comments in .ini Files diff --git a/docs/sources/installation/mac.md b/docs/sources/installation/mac.md index 8c85fa2806a..22eb0f6e0c3 100755 --- a/docs/sources/installation/mac.md +++ b/docs/sources/installation/mac.md @@ -1,5 +1,5 @@ +++ -title = "Installing on macOS" +title = "Install on macOS" description = "Installing Grafana on macOS" keywords = ["grafana", "configuration", "documentation", "mac", "homebrew", "osx"] type = "docs" @@ -8,74 +8,43 @@ parent = "installation" weight = 500 +++ +# Install on macOS -# Installing on macOS +This page provides instructions to help you install Grafana on macOS. -This page provides instructions to help you install Grafana on macOS. You can either install using homebrew or a binary tar file. +**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 -## Install using homebrew +Before you begin, you must have [Homebrew](http://brew.sh/) installed. -Installation can be done using [homebrew](http://brew.sh/) +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. +2. 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** - Not currently available for Mac. +3. Click **Mac**. +4. Copy and paste the code from the installation page into your command line and run. It follows the pattern shown below. -Install latest stable: + ```bash + brew update + brew install grafana + ``` -```bash -brew update -brew install grafana -``` +## 2. Start Grafana -To start grafana look at the command printed after the homebrew install completes. - -To upgrade use the reinstall command - -```bash -brew update -brew reinstall grafana -``` - -------------- - -You can also install the latest unstable grafana from git: - - -```bash -brew install --HEAD grafana/grafana/grafana -``` - -To upgrade grafana if you've installed from HEAD: - -```bash -brew reinstall --HEAD grafana/grafana/grafana -``` - -### Start Grafana - -To start Grafana using homebrew services first make sure homebrew/services is installed. - -```bash -brew tap homebrew/services -``` - -Then start Grafana using: +Start Grafana using Homebrew services: ```bash brew services start grafana ``` -Default login and password `admin`/ `admin` +## Upgrade with Homebrew -## Install from binary tar file +To upgrade Grafana, use the reinstall command: -Download [the latest `.tar.gz` file](https://grafana.com/get) and -extract it. This will extract into a folder named after the version you -downloaded. This folder contains all files required to run Grafana. There are -no init scripts or install scripts in this package. - -To configure Grafana add a configuration file named `custom.ini` to the -`conf` folder and override any of the settings defined in -`conf/defaults.ini`. - -### Start Grafana - -Start Grafana by executing `./bin/grafana-server`. The `grafana-server` binary needs the working directory to be the root install directory (where the binary and the `public` folder is located). +```bash +brew update +brew reinstall grafana +```