From d38c159893bec77d1a6ce1657f8375f08f20cb3c Mon Sep 17 00:00:00 2001 From: Patrick O'Carroll Date: Thu, 23 Aug 2018 14:39:50 +0200 Subject: [PATCH] added link to getting started to all, changed wording --- docs/sources/guides/getting_started.md | 10 +++++----- docs/sources/installation/debian.md | 5 ++--- docs/sources/installation/docker.md | 5 ++--- docs/sources/installation/mac.md | 5 ++--- docs/sources/installation/rpm.md | 5 ++--- docs/sources/installation/windows.md | 5 ++--- docs/sources/project/building_from_source.md | 5 ++--- 7 files changed, 17 insertions(+), 23 deletions(-) diff --git a/docs/sources/guides/getting_started.md b/docs/sources/guides/getting_started.md index fcb7ff9b060..783009c60b5 100644 --- a/docs/sources/guides/getting_started.md +++ b/docs/sources/guides/getting_started.md @@ -17,7 +17,7 @@ This guide will help you get started and acquainted with Grafana. It assumes you ## Logging in for the first time -To run Grafana open your browser and go to port 3000 which is the default port. If you have changed the port you go to that port. There you will see the login page. User name is admin and password is admin. When you log in for the first time you will be asked to change your password. You can later go to user preferences and change your user name. +To run Grafana open your browser and go to the default port http://localhost:3000 or the port you have configured. There you will see the login page. Default username is admin and default password is admin. When you log in for the first time you will be asked to change your password. We strongly encourage you to follow Grafana’s best practices and change the default administrator password. You can later go to user preferences and change your user name. ## How to add a data source @@ -26,19 +26,19 @@ To run Grafana open your browser and go to port 3000 which is the default port. Before you create your first dashboard you need to add your data source. -First move your cursor to the cog on the side menu which will show you the configuration menu. If the side menu is not visible click the Grafana icon in the upper left corner. The first item on the configuration menu is data sources. Click and you will come to data sources. You can also simply click the cog. +First move your cursor to the cog on the side menu which will show you the configuration menu. If the side menu is not visible click the Grafana icon in the upper left corner. The first item on the configuration menu is data sources, click on that and you'll be taken to the data sources page where you can add and edit data sources. You can also simply click the cog. Click Add data source and you will come to the settings page of your new data source. {{< docs-imagebox img="/img/docs/v52/add-datasource.png" max-width="700px" class="docs-image--no-shadow">}} -The first thing you will do is give the data source a name and select the right type. -Next you need to specify the data sources HTTP URL and how you will access the data source. +First, give the data source a Name and then select which Type of data source you'll want to create, see [Supported data sources](/features/datasources/#supported-data-sources/) for more information and how to configure your data source. + {{< docs-imagebox img="/img/docs/v52/datasource-settings.png" max-width="700px" class="docs-image--no-shadow">}} -Now you are ready to save and test. +After you have configuered your data source you are ready to save and test. ## Beginner guides diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md index e9504c7cbf3..2d0c5aaf36e 100644 --- a/docs/sources/installation/debian.md +++ b/docs/sources/installation/debian.md @@ -169,6 +169,5 @@ binary and the `public` folder is located). ## Logging in for the first time -To run Grafana open your browser and go to port 3000 which is the default port. If you have changed the port you go to that port. There you will see the login page. User name is admin and password is admin. When you log in for the first time you will be asked to change your password. You can later go to user preferences and change your user name. - -Here you can get help [getting started](https://www.youtube.com/watch?v=sKNZMtoSHN4&index=7&list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2) with your dashboards. \ No newline at end of file +To run Grafana open your browser and go to the default port http://localhost:3000 or the port you have configured. +Then follow the instructions [here](/guides/getting_started/). \ No newline at end of file diff --git a/docs/sources/installation/docker.md b/docs/sources/installation/docker.md index 719af9a4e05..714143547ab 100644 --- a/docs/sources/installation/docker.md +++ b/docs/sources/installation/docker.md @@ -215,6 +215,5 @@ chown -R root:root /etc/grafana && \ ## Logging in for the first time -To run Grafana open your browser and go to port 3000 which is the default port. If you have changed the port you go to that port. There you will see the login page. User name is admin and password is admin. When you log in for the first time you will be asked to change your password. You can later go to user preferences and change your user name. - -Here you can get help [getting started](https://www.youtube.com/watch?v=sKNZMtoSHN4&index=7&list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2) with your dashboards. \ No newline at end of file +To run Grafana open your browser and go to the default port http://localhost:3000 or the port you have configured. +Then follow the instructions [here](/guides/getting_started/). \ No newline at end of file diff --git a/docs/sources/installation/mac.md b/docs/sources/installation/mac.md index 72ec0871646..0bc09aee61a 100644 --- a/docs/sources/installation/mac.md +++ b/docs/sources/installation/mac.md @@ -94,6 +94,5 @@ binary and the `public` folder is located). ## Logging in for the first time -To run Grafana open your browser and go to port 3000 which is the default port. If you have changed the port you go to that port. There you will see the login page. User name is admin and password is admin. When you log in for the first time you will be asked to change your password. You can later go to user preferences and change your user name. - -Here you can get help [getting started](https://www.youtube.com/watch?v=sKNZMtoSHN4&index=7&list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2) with your dashboards. \ No newline at end of file +To run Grafana open your browser and go to the default port http://localhost:3000 or the port you have configured. +Then follow the instructions [here](/guides/getting_started/). \ No newline at end of file diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md index 0f50ed026b8..2e22d424c29 100644 --- a/docs/sources/installation/rpm.md +++ b/docs/sources/installation/rpm.md @@ -195,6 +195,5 @@ binary and the `public` folder is located). ## Logging in for the first time -To run Grafana open your browser and go to port 3000 which is the default port. If you have changed the port you go to that port. There you will see the login page. User name is admin and password is admin. When you log in for the first time you will be asked to change your password. You can later go to user preferences and change your user name. - -Here you can get help [getting started](https://www.youtube.com/watch?v=sKNZMtoSHN4&index=7&list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2) with your dashboards. \ No newline at end of file +To run Grafana open your browser and go to the default port http://localhost:3000 or the port you have configured. +Then follow the instructions [here](/guides/getting_started/). \ No newline at end of file diff --git a/docs/sources/installation/windows.md b/docs/sources/installation/windows.md index 5bd66b8ac6d..6cf68e75d67 100644 --- a/docs/sources/installation/windows.md +++ b/docs/sources/installation/windows.md @@ -46,6 +46,5 @@ recommend [TDM-GCC](http://tdm-gcc.tdragon.net/download). ## Logging in for the first time -To run Grafana open your browser and go to port 3000 which is the default port. If you have changed the port you go to that port. There you will see the login page. User name is admin and password is admin. When you log in for the first time you will be asked to change your password. You can later go to user preferences and change your user name. - -Here you can get help [getting started](https://www.youtube.com/watch?v=sKNZMtoSHN4&index=7&list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2) with your dashboards. \ No newline at end of file +To run Grafana open your browser and go to the port you configured above, e.g. http://localhost:8080. +Then follow the instructions [here](/guides/getting_started/). \ No newline at end of file diff --git a/docs/sources/project/building_from_source.md b/docs/sources/project/building_from_source.md index 6a9e56a5eda..b1e17b655c8 100644 --- a/docs/sources/project/building_from_source.md +++ b/docs/sources/project/building_from_source.md @@ -147,6 +147,5 @@ Please contribute to the Grafana project and submit a pull request! Build new fe ## Logging in for the first time -To run Grafana open your browser and go to port 3000 which is the default port. If you have changed the port you go to that port. There you will see the login page. User name is admin and password is admin. When you log in for the first time you will be asked to change your password. You can later go to user preferences and change your user name. - -Here you can get help [getting started](https://www.youtube.com/watch?v=sKNZMtoSHN4&index=7&list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2) with your dashboards. \ No newline at end of file +To run Grafana open your browser and go to the default port http://localhost:3000 or the port you have configured. +Then follow the instructions [here](/guides/getting_started/). \ No newline at end of file