diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index 562b56b8055..b8f438a98d2 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -46,6 +46,7 @@ pages: - ['reference/playlist.md', 'Reference', 'Playlist'] - ['reference/export_import.md', 'Reference', 'Import & Export'] - ['reference/admin.md', 'Reference', 'Grafana Admin'] +- ['reference/admin.md', 'Reference', 'HTTP API'] - ['datasources/graphite.md', 'Data Sources', 'Graphite'] - ['datasources/influxdb.md', 'Data Sources', 'InfluxDB'] diff --git a/docs/sources/guides/changes_in_v2.md b/docs/sources/guides/changes_in_v2.md index a567ac8fdb3..f5bf9d02617 100644 --- a/docs/sources/guides/changes_in_v2.md +++ b/docs/sources/guides/changes_in_v2.md @@ -20,13 +20,13 @@ This is a guide that descriptes some of changes and new features that can be fou 5. Share current dashboard (Make sure the dashboard is saved before) 6. Save current dashboard 7. Settings dropdown - - Dashboard settings - - Annotations - - Templating - - Export (exports current dashboard to json file) - - View JSON (view current dashboard json model) - - Save As... (Copy & Save current dashboard under a new name) - - Delete dashboard + - Dashboard settings + - Annotations + - Templating + - Export (exports current dashboard to json file) + - View JSON (view current dashboard json model) + - Save As... (Copy & Save current dashboard under a new name) + - Delete dashboard > **Note** In Grafana v2.0 when you change the title of a dashboard and then save it it will no > longer create a new dashboard. It will just change the name for the current dashboard. diff --git a/docs/sources/installation/index.md b/docs/sources/installation/index.md index a0cacb7474e..3f4ebf12118 100644 --- a/docs/sources/installation/index.md +++ b/docs/sources/installation/index.md @@ -69,6 +69,18 @@ Grafana has an offical docker container. All grafana configuration settings can be defined using ENVIRONMENT variables, this is especially useful when using the above container. +### Docker volumes & ENV config + +The docker container exposes two volumes, the sqlite3 database in the folder `/opt/grafana/data` and +configuration files in the `/opt/grafana/conf` folder. You can map these volumes to host folders when you start the container: + + $ docker run -d -p 3000:3000 \ + -v /var/grafana/data:/opt/grafana/data \ + -e "GF_SECURITY_ADMIN_PASSWORD=secret \ + grafana/grafana:develop + +In the above example I map the data folder and set a config option via an `ENV` variable. + ## Configuration The backend web server has a number of configuration options. Go the [Configuration](configuration) page for details diff --git a/docs/sources/installation/migrating_to2.md b/docs/sources/installation/migrating_to2.md index 32b72be362b..d70584b720c 100644 --- a/docs/sources/installation/migrating_to2.md +++ b/docs/sources/installation/migrating_to2.md @@ -9,7 +9,13 @@ page_keywords: grafana, installation, migration, documentation Grafana 2.x is pretty different from v1.x in that Grafana 2.x has its own backend and its own database to store dashboards and users in. -## Import dashboards +## Adding Data sources + +Data sources in Grafana v2.0 are no longer configured via the `config.js` file. That config file is no more. +You add data sources via UI or via the [HTTP API](../reference/http_api). Go the `Data Sources` view via the side menu. +The side menu can be toggled via the Grafana icon in the top header (to the right). + +## Importing dashboards ### From Elasticsearch Start by going to the `Data Sources` view and add your elasticsearch datasource. Specify the elasticsearch @@ -39,4 +45,3 @@ and click the `Import` button. ![](/img/v2/migrate_dashboards.jpg) - diff --git a/docs/sources/reference/http_api.md b/docs/sources/reference/http_api.md new file mode 100644 index 00000000000..b7ef92e0ba8 --- /dev/null +++ b/docs/sources/reference/http_api.md @@ -0,0 +1,10 @@ +---- +page_title: HTTP API +page_description: Grafana HTTP API Reference +page_keywords: grafana, admin, http, api, documentation +--- + +# HTTP API Reference + +This documentation page has yet to be written. + diff --git a/src/app/partials/dashboard_topnav.html b/src/app/partials/dashboard_topnav.html index eb68f63ea5a..7c4327004db 100644 --- a/src/app/partials/dashboard_topnav.html +++ b/src/app/partials/dashboard_topnav.html @@ -11,16 +11,11 @@
+ {{dashboard.title}}
- - - - - {{dashboard.title}} -