IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,248 Commits 5,454 Branches 554 Tags 1.9 GiB
5b318428c4
Commit Graph

974 Commits

Author SHA1 Message Date
bergquist
c18741c605 docs(ldap): adds note about special chars in password 
closes #5337
 2016-12-21 22:02:34 +01:00
bergquist
02bf83b37e docs: fixes broken code formating 2016-12-21 15:35:55 +01:00
bergquist
c3005397f5 docs: adds guide for whats new in 4.1 beta 2016-12-21 08:33:35 +01:00
bergquist
1c8865e702 docs: updates links to windows beta build 2016-12-20 16:08:05 +01:00
bergquist
afa5e9507a docs: updates install links for 4.1.0 beta 2016-12-20 13:15:59 +01:00
Utkarsh Bhatnagar
13c4ce68ee Added name and id in response of create/update (#7016) 2016-12-20 13:02:26 +01:00
bergquist
0c857e0ed8 docs(http): adds info about mass pausing alerts 2016-12-19 16:45:46 +01:00
Torkel Ödegaard
3be77ad293 fix(docs): fixed spelling in docs article 2016-12-19 08:42:37 +01:00
bergquist
86f148be48 docs(paths): updates relative path on /installation/ page 2016-12-16 17:42:40 +01:00
bergquist
30022b0d0b docs(paths): adds aliase for rpm and debian install 
got reports on twitter about broken links.
 2016-12-16 17:36:01 +01:00
Mitsuhiro Tanda
bc8d27737f fix cloudwatch docs (#6992) 2016-12-16 11:31:02 +01:00
Torkel Ödegaard
435f474e8a docs(): minor fix for docker docs 2016-12-14 22:30:20 +01:00
Torkel Ödegaard
c59fd2e8f6 fix(docs): fixed support for old docs url, fixes #6960 2016-12-14 21:21:21 +01:00
Torkel Ödegaard
e72a60bbf5 feat(graph): shared graph tooltip is not a select option with 3 options, normal, shared crosshair & shared tooltip, CTRL+O or CMD+O cycles option, closes #6894 2016-12-14 14:33:33 +01:00
Utkarsh Bhatnagar
5777f65d05 Basic Auth now supports LDAP username and password (#6940) 2016-12-13 09:15:52 +01:00
Torkel Ödegaard
80d88d302c fix(config): changed default for oauth and allow_sign_up setting, #6928 2016-12-12 16:35:42 +01:00
bergquist
ba848cffb4 docs(cli): add page for the cli 2016-12-12 13:15:35 +01:00
bergquist
413a187119 docs(notification): add message property to notification 2016-12-12 11:28:16 +01:00
Utkarsh Bhatnagar
db3ac79015 Fixed Create org API in docs 2016-12-08 12:08:04 -08:00
bergquist
49827de278 docs: release 4.0.2 2016-12-08 15:05:37 +01:00
Andrey Artemov
c97e95227a Fix some typos in "Export & Import" reference 2016-12-08 10:34:53 +02:00
Andrey Artemov
c94805d4c2 Fix typo in Singlestat page title 2016-12-08 10:34:31 +02:00
Mike Rostermund
c5b29228ee Add missing char/typo 2016-12-06 22:26:43 +01:00
bergquist
464553a453 docs: explains how to use comment chars in passwords 2016-12-06 09:48:56 +01:00
bergquist
8134724b8a docs: update links to 4.0.1 2016-12-02 17:17:33 +01:00
Solar Olugebefola
1c234c6089 typo? 2016-12-01 11:54:07 -05:00
Carl Bergquist
c2ed24b788 Merge pull request #6740 from dirk-leroux/new_aggregation_on_singlestat_panel 
New aggregation on singlestat panel
 2016-11-29 23:18:01 +01:00
bergquist
bb6248a51a docs: remove link to CLA since we use CLA assistance 2016-11-29 21:51:51 +01:00
bergquist
b00e9390d3 docs(v4): update docs for v4 2016-11-29 19:03:33 +01:00
Dirk le Roux
e0073d7e54 Fixed spelling error 2016-11-29 08:32:51 +02:00
Dirk le Roux
6412bd2f57 oAdded value type documentation to singlestat panel 
Signed-off-by: Dirk le Roux <dirk.leroux@gmail.com>
 2016-11-29 08:26:32 +02:00
bergquist
b2edcd8cfd tech(docs): use relref for links 2016-11-27 20:22:29 +01:00
bergquist
ce64a0173c docs(datasource): add root datasource page 2016-11-27 20:05:35 +01:00
bergquist
3475ff2d81 docs(http): moves overview content to /http_api/ 
ref #6719
 2016-11-27 17:09:56 +01:00
bergquist
583de8e0e0 docs(graph): remove unused headers 2016-11-27 16:10:16 +01:00
bergquist
adc1bd3dea docs(graph): moves thresholds to display tab 
closes #6703
 2016-11-27 16:07:41 +01:00
bergquist
2bbe3d56bc docs(alerting): add info about alerting metrics 2016-11-24 13:45:24 +01:00
bergquist
6081c6cb61 docs(http_api): convert to new docs format 2016-11-24 10:16:24 +01:00
bergquist
02dc51b1b6 docs(influxdb): typo 2016-11-23 07:15:34 +01:00
Hernán Rodríguez Colmeiro
e7e83a71a6 Fix typo in Basic Concepts 2016-11-22 21:47:59 -03:00
Torkel Ödegaard
092f0c4b62 docs(): fixed windows link 2016-11-21 10:58:45 +01:00
Torkel Ödegaard
a5c0295a0e docs(): updated doc download links 2016-11-21 10:18:43 +01:00
Torkel Ödegaard
457ae74343 Merge branch 'or_alerting' of https://github.com/utkarshcmu/grafana into utkarshcmu-or_alerting 2016-11-17 14:43:24 +01:00
Torkel Ödegaard
f52c6aafe7 docs(): minor update to centos docs about font packages needed for phantomjs 2016-11-16 18:49:14 +01:00
Torkel Ödegaard
e6776f71d9 cleanup(sass): removed tight-form styles 2016-11-16 18:26:39 +01:00
bergquist
e12a4f6b46 docs(notifications): fixes typo 2016-11-16 10:55:47 +01:00
bergquist
cbe8af967d docs(api): add docs about creating new org 
close #6588
 2016-11-16 09:06:32 +01:00
utkarshcmu
f46c4c88ca Added OR condition in docs 2016-11-15 22:43:09 -08:00
Nic Roland
0cdf05ae5d docs(datasources/influxdb): Fix broken image link 
Twas missing a leading `/`.
 2016-11-14 16:04:33 +00:00
Torkel Ödegaard
62ff85e774 docs(): fixed ldap link 2016-11-14 11:34:58 +01:00
Torkel Ödegaard
9f7d0862e8 docs(): minor docs fix 2016-11-10 13:08:32 +01:00
Torkel Ödegaard
fff26086d5 docs(): updated install links with beta links as well 2016-11-09 13:53:20 +01:00
Torkel Ödegaard
33664b0a7e docs(): minor docs change 2016-11-09 11:14:04 +01:00
Torkel Ödegaard
20d789cb94 docs(): fix title 2016-11-08 20:57:16 +01:00
Torkel Ödegaard
d717e0cf13 docs(): minor spelling fix 2016-11-08 20:57:16 +01:00
bergquist
029e52f5a1 docs(pagerduty): update docs regarding pagerduty 2016-11-08 20:41:02 +01:00
Torkel Ödegaard
fd09f17cd3 docs(): alerting docs, #6490 2016-11-08 14:53:28 +01:00
bergquist
309391cb79 docs(alerting): not only graphite 2016-11-08 11:24:39 +01:00
bergquist
5445e47fd5 docs(alerting): typo 2016-11-08 11:24:19 +01:00
bergquist
1f2b8044b2 docs(notifications): format as table 2016-11-08 11:14:35 +01:00
Torkel Ödegaard
b658f38036 docs(): added what new in v4 article and initial draf of alerting docs, #6490 2016-11-08 11:09:10 +01:00
bergquist
8ca18b511f docs(alerting): add docs for alert notifications 2016-11-08 10:58:59 +01:00
Torkel Ödegaard
49af12f69f Merge branch 'master' of github.com:grafana/grafana 2016-11-08 09:31:19 +01:00
Carl Bergquist
9479364600 Merge pull request #6481 from msound/update-github-auth-documentation 
Update github auth docs
 2016-11-07 20:42:05 +01:00
Torkel Ödegaard
901e670db4 docs(): minor tweak 2016-11-07 19:58:30 +01:00
Torkel Ödegaard
a100836bb4 docs(): Added pages for alerting docs, added keyboard shortcuts doc article, #6490 2016-11-07 15:18:27 +01:00
Mani Soundararajan
db77dfea7a Update github auth docs 
In Github's "allowed organizations" scenario, it makes sense to have
`allow_sign_up` to be `true` as most administrators will expect their
org's github users to be able to sign in without further steps like
creating a local user first.
 2016-11-06 20:48:14 +05:30
Torkel Ödegaard
2d19af601a fix(alerting): various alerting fixes 2016-11-06 15:40:02 +01:00
Torkel Ödegaard
2b81b204aa docs(): fixing image urls in docs 2016-11-04 20:29:17 +01:00
Carl Bergquist
691956bd33 Merge pull request #6363 from Noah-Heil/patch-1 
Added two hints to help newer users
 2016-11-04 11:12:20 +01:00
bergquist
9b28bf25a4 docs(cli): add info about how to install specific plugin version 
closes #6434
 2016-11-01 18:35:15 +01:00
Noah Heil
56ccd80cce Added two hints to help newer users 
I spent a couple of hours trying to figure out why the cloudwatch datasource was not working and the "internal error" notice was not helpful. So I added some hints so that people who are a little newer to linux/aws/grafana wont have to suffer like I did.
 2016-10-24 03:05:16 -06:00
Torkel Ödegaard
1581bf8d5b fix(docs): added api_url to configuration docs, fixes #6351 2016-10-22 08:51:32 +02:00
Torkel Ödegaard
96008c9738 Squashed commit of the following: 
commit 4113ed00782590187d19dd2f8cbae683f164142c
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Fri Oct 21 10:47:35 2016 +0200

    docs(): minor fix for docs index page

commit 45478d120571519462fac905aadeab5954696690
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Thu Oct 20 14:28:21 2016 +0200

    updated

commit c9c1c1d5a462f85e8001a45218f24102583d7aee
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Thu Oct 20 14:27:34 2016 +0200

    docs(): updated image refs

commit 5fa0f27963968d77bbbbb7edd973847ea72135e3
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Wed Oct 19 14:33:04 2016 +0200

    docs is almost done

commit 6b988c90cb08563e2c27212338c2947e69f6fcc3
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Tue Oct 18 20:45:28 2016 +0200

    almost done

commit 17757c21ed813892ddb1f289f2e52613caf7bcef
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Tue Oct 18 16:45:48 2016 +0200

    making progress on docs

commit f06c815991dd81b8893912a6da04a17b80b63fda
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Tue Oct 18 14:30:55 2016 +0200

    progress on new docs

commit 5197237426252623de2d8b9cc22ddbbdbb240763
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Tue Oct 18 13:25:26 2016 +0200

    making progress

commit 33e2b6b617f16f65878141cf11e54b2817a2ea96
Merge: de385e5 ecb4a99
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Tue Oct 18 12:17:58 2016 +0200

    Merge branch 'new-docs' of github.com:grafana/grafana into new-docs

commit ecb4a99dd54aa39f17d9bf4d7e132a389812f8fd
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Tue Oct 18 10:39:59 2016 +0200

    keep urls for now

commit de385e56d86b071cf2150ccf9f1aa06ec5187277
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Mon Oct 17 17:56:18 2016 +0200

    more progress

commit 8469ebc239ab2316cbbc01862e5026737f272f00
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Mon Oct 17 17:08:06 2016 +0200

    progress on new docs

commit e755f656b12534cfcb23bad11f1fa696e43f7428
Merge: 4644a35 35cce3b
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Mon Oct 17 12:21:27 2016 +0200

    Merge branch 'new-docs' of github.com:grafana/grafana into new-docs

commit 4644a35102555204787e91041b50dcbfe0f7a213
Merge: 25c4bef 977cdd5
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Mon Oct 17 12:21:11 2016 +0200

    Merge branch 'master' of github.com:grafana/grafana into new-docs

commit 35cce3bef802fac020a53693b02c112a91a096fc
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Mon Oct 17 09:31:17 2016 +0200

    progress on #6170

commit 25c4bef629de7d77218ba95cc3bd25fb50bb19d6
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Sun Oct 16 15:05:30 2016 +0200

    fix for osx

commit 6c6b52f975630be87da23dd51beafaecb820cec2
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Sun Oct 16 12:56:39 2016 +0200

    progress on new docs

commit 6a09633981ab26191d5542dbe3a788846ac6b73d
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Sat Oct 15 11:39:49 2016 +0200

    progress on new docs

commit 7d533fbc23e41b86fd1ba9c955dd17ae1ad977e5
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Mon Oct 10 09:25:12 2016 +0200

    making progress on new docs site

commit 50392ce98edfa201977716e92e4a86f9d48ae386
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Sun Oct 9 20:02:28 2016 +0200

    feat(new docs): progress on new docs site

commit 81a3d3d0952d3a5d790412e90d01ac5a247e0686
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Fri Oct 7 07:52:11 2016 +0200

    new docs site experiment

commit 704adc98664665b3624087ab38ce29fc9da005f1
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Sat Oct 1 20:46:53 2016 +0200

    new docs poc
 2016-10-21 11:01:34 +02:00
Carl Bergquist
0793811b7e Merge pull request #6192 from polynomial/fix_typo 
fix(docs): duplicate word data in Graph Panel
 2016-10-13 17:17:49 +02:00
bergquist
a3c91450d5 tech(config): add log.filters to default and sample 2016-10-07 10:39:01 +02:00
Wolfram Kroll
7e6595acaf hint about how to override settings from default section (#6181) 2016-10-07 08:48:57 +02:00
Benjamin Smith
39769ea65b fix(docs): duplicate word data in Graph Panel 2016-10-04 12:40:34 -07:00
miao
1f5a68aab1 Modify basic introductions of docs and make it exact (#6166) 2016-10-01 16:50:09 +02:00
Torkel Ödegaard
0ab2113fab docs(config): added missing smtp config section, fixes #6155 2016-09-30 07:40:58 +02:00
Torkel Ödegaard
50d146e82c fix(docs): fixed influxdb docs and mention of InfluxDB version, #6027 2016-09-29 14:53:50 +02:00
Torkel Ödegaard
2750c8a801 feat(config): changed name of allow_user_login_pass to disable_login_form, changed the section of the config option to [auth], impacts merged PR #5423 2016-09-28 15:27:08 +02:00
bergquist
6a699d13c4 docs(configuration): add note about snapshot configuration 2016-09-26 14:46:03 +02:00
Torkel Ödegaard
598ac0e815 docs(http api): Clarified issue with admin http api docs, fixes #5834# 2016-09-22 09:09:12 +02:00
Steven Arnott
6e4ed4debd Altered DB for Prefix (#6062) 2016-09-19 17:12:43 +02:00
Torkel Ödegaard
852fd66c4c Update debian.md 2016-09-16 10:42:15 +02:00
bergquist
a95808a7c3 docs(build): update required go version to 1.7 2016-09-15 16:29:25 +02:00
bergquist
dede58915d Merge branch 'go_vendor' 2016-09-15 13:25:50 +02:00
bergquist
6be48269e2 tech(build): update build docs 2016-09-15 13:09:33 +02:00
Zihao Yu
6d843e3db5 update github oauth docs (#6042) 2016-09-15 11:29:03 +02:00
bergquist
811b7188c4 docs(config): add docs for how to run grafana behind a reverse proxy 2016-09-12 14:47:21 +02:00
Chen Chenglong
7b1c374f64 support connect ldap server with starttls (#5969) 
* support connect ldap server with starttls

* add more doc for start_tls option
 2016-09-10 09:40:56 +02:00
bergquist
166df66f66 docs(go): update go dep to 1.6 2016-09-07 11:28:22 +02:00
bergquist
10b3ee362c docs(oauth): add generic_auth to docs 2016-09-07 11:06:59 +02:00
Dariusz Dwornikowski
1b283d052b Changed EBS to ELB 2016-09-02 20:49:28 +02:00
bergquist
a5d49c9820 docs(config): add note about poodle vulnerabillity in <3.0 
closes #3483
 2016-08-31 08:34:15 +02:00
Torkel Ödegaard
05697d5ecd Merge branch 'master' into alerting 
Conflicts:
	conf/sample.ini
 2016-08-17 10:03:33 +02:00
Torkel Ödegaard
6fae5a3b4e Merge branch 'v3.1.x' 2016-08-17 10:02:08 +02:00
Torkel Ödegaard
093563ac37 fix(metrics): restored prefix default to prod.grafana.. 2016-08-17 10:01:55 +02:00
bergquist
4d0982a21c Merge branch 'master' into alerting 2016-08-15 07:58:30 +02:00
Kouhei Sutou
46630df88d Update the number of ways 2016-08-13 14:12:29 +09:00
Torkel Ödegaard
8878a55dc6 Merge branch 'master' into alerting 2016-08-11 10:31:15 +02:00
Torkel Ödegaard
da6ac07b1d Merge branch 'v3.1.x' 2016-08-11 10:29:48 +02:00
Torkel Ödegaard
780ec92dd8 fix(docs): fixed plugins docs, fixes #5777 2016-08-11 07:39:34 +02:00
Jeremy Bingham
7150571e60 Mac grafana wrapper script (#5779) 
* One of the homebrew folks first asked for a wrapper script to make launching grafana easier. Later I was asked to remove it and submit it upstream, so here it is.

* add instructions for installing grafana HEAD from git with homebrew back to the docs
 2016-08-11 07:37:35 +02:00
Jeremy Bingham
2c4ab4af02 Mac grafana wrapper script (#5779) 
* One of the homebrew folks first asked for a wrapper script to make launching grafana easier. Later I was asked to remove it and submit it upstream, so here it is.

* add instructions for installing grafana HEAD from git with homebrew back to the docs
 2016-08-11 07:36:14 +02:00
Torkel Ödegaard
4fd8b2ace4 Merge branch 'master' into alerting 2016-08-10 12:53:41 +02:00
Torkel Ödegaard
c5d0c9f088 Merge branch 'v3.1.x' 2016-08-10 08:42:30 +02:00
Torkel Ödegaard
c0301349fb docs(): update mac docs 2016-08-10 08:39:57 +02:00
Torkel Ödegaard
624e30e743 fix(docs): minor doc fixes, fixes #5751 2016-08-10 08:38:08 +02:00
Torkel Ödegaard
34ea7312bc docs(): added missing snapshot config options, fixes #5708 2016-08-02 09:35:15 +02:00
Torkel Ödegaard
2bfccd77d4 docs(): updated release links 2016-08-01 12:47:55 +02:00
Torkel Ödegaard
84d7305d37 docs(): updated release links 2016-08-01 12:45:31 +02:00
Torkel Ödegaard
c675ffc682 Merge branch 'master' into alerting 2016-07-27 09:45:16 +02:00
Peter Bonney
62e162c44c Update dashboard.md (#5640) 
The key returned by `GET /api/dashboards/db/:slug` is "dashboard" (not "model").
 2016-07-23 11:46:20 +02:00
Torkel Ödegaard
b0fe69822a Merge branch 'master' into alerting 
Conflicts:
	public/app/core/services/alert_srv.ts
	public/app/partials/confirm_modal.html
 2016-07-18 18:22:35 +02:00
Torkel Ödegaard
4bb4d7f7d3 Merge branch 'v3.1.x' 2016-07-12 15:54:31 +02:00
Torkel Ödegaard
6c2a61001a docs(): updated download links 2016-07-12 13:19:20 +02:00
Torkel Ödegaard
d9096110f8 Merge branch 'master' into alerting 
Conflicts:
	pkg/api/dashboard.go
	pkg/models/dashboards.go
	pkg/services/sqlstore/dashboard.go
 2016-07-11 18:28:07 +02:00
Torkel Ödegaard
08202dcb83 Merge branch 'v3.1.x' 2016-07-11 09:39:17 +02:00
Fraser Savage
5a8efa9a52 Update configuration.md (#5527) 
Insert missing backtick.
 2016-07-08 07:12:26 +02:00
joe miller
a6554a85c0
grammar fix in docs 2016-07-02 08:27:31 -07:00
Rakotomandimby Mihamina
16e2c660ac Update debian.md 2016-06-28 15:58:00 +03:00
bergquist
4ed6b99d9a Merge branch 'alerting_notifications' into alerting 2016-06-26 04:05:56 +02:00
Torkel Ödegaard
346ca3fc89 Merge branch 'master' into alerting 2016-06-25 09:56:57 -04:00
Torkel Ödegaard
9435e70b37 docs(): spelling fix 2016-06-23 17:31:22 +02:00
Torkel Ödegaard
c3e1955792 docs(): updated export docs 2016-06-23 13:21:30 +02:00
Torkel Ödegaard
1d35b90484 docs(): updated download links 2016-06-23 10:35:47 +02:00
Torkel Ödegaard
53c424caf8 docs(): title change 2016-06-21 18:25:24 +02:00
Torkel Ödegaard
23cfbac4ec feat(docs): updated import / export docs 2016-06-21 18:24:25 +02:00
bergquist
ef9766eb96 docs(3.1): initial post about whats new in 3.1 2016-06-21 16:29:17 +02:00
Wadim Kruse
3b47b1ecbd Add Prometheus annotations doc 2016-06-20 18:36:05 +02:00
bergquist
403fdebca3 docs(alerting): rewrite alert docs 2016-06-20 17:05:16 +02:00
bergquist
8ec311ade4 Merge branch 'master' into alerting 2016-06-16 16:29:41 +02:00
Torkel Ödegaard
ec0b09450c Merge branch 'export-dashboard' 
Conflicts:
	conf/defaults.ini
	pkg/setting/setting.go
	public/app/core/components/grafana_app.ts
	public/app/core/core.ts
	public/app/features/dashboard/dashboardCtrl.js
 2016-06-16 08:06:43 +02:00
utkarshcmu
f3003a97ef Added required documentation 2016-06-13 04:34:23 -07:00
hailthemelody
ef9500a8f0 update pricing to include 1 million free API requests per month 2016-06-12 11:41:43 -04:00
Torkel Ödegaard
f36a44c49a Merge branch 'master' into alerting_definitions 
Conflicts:
	conf/defaults.ini
	pkg/api/dashboard.go
 2016-06-06 08:43:01 +02:00
Torkel Ödegaard
1059a35bbc feat(instrumentation): documented instrumentation options, closes #4696 2016-06-03 18:38:19 +02:00
bergquist
1686d86c3b Merge branch 'master' into alerting_definitions 2016-05-30 08:26:08 +02:00
Torkel Ödegaard
ba6573af61 Merge branch 'master' into export-dashboard 
Conflicts:
	public/app/features/dashboard/submenu/submenu.ts
 2016-05-25 12:32:56 +02:00
Torkel Ödegaard
f923edc424 Merge branch 'v3.0.x' 2016-05-25 12:29:35 +02:00
Torkel Ödegaard
3312a042dd docs(): updated download links 2016-05-25 11:50:00 +02:00
Torkel Ödegaard
dc9dcd045d Merge branch 'master' of github.com:grafana/grafana 2016-05-24 08:11:52 +02:00
Torkel Ödegaard
fd08c821f9 Merge branch 'v3.0.x' 
Conflicts:
	package.json
 2016-05-24 07:52:27 +02:00
Zdenek Styblik
fff5aa3020 Add missing option Read-Only Editor to auto_assign_org_role description (#5139) 
Commit adds missing option `Read-Only Editor` to `auto_assign_org_role` description.
 2016-05-23 21:24:23 +02:00
Torkel Ödegaard
9e6056551d docs(): updated download links 2016-05-23 14:13:30 +02:00
Torkel Ödegaard
9eec68985d docs(): updated download links 2016-05-23 11:49:07 +02:00
Torkel Ödegaard
cac723dab3 Merge branch 'master' into export-dashboard 2016-05-19 08:48:24 +02:00
bergquist
ef4f5147be Merge branch 'master' into alerting_definitions 2016-05-19 08:05:35 +02:00
Tim Bielawa
24a410ae8f docs(preferences): Document user and org preferences (#5087) 
closes #5069
 2016-05-18 18:31:59 +02:00
Mitsuhiro Tanda
392cb2a714 (cloudwatch) update changelog (#5080) 
* update cloudwatch.md

* update changelog
 2016-05-18 13:27:19 +02:00
Torkel Ödegaard
6632f883c0 Merge branch 'master' into export-dashboard 
Conflicts:
	.floo
	.flooignore
 2016-05-18 08:08:15 +02:00
bergquist
b5fc12fb80 docs(opentsdb): add working image of add datasource for opentsdb 
closes #4984
 2016-05-17 15:32:33 +02:00
Torkel Ödegaard
df50fa2332 feat(export): export dashboard modal 2016-05-17 11:17:11 +02:00
Torkel Ödegaard
495404ef73 Merge branch 'master' into alerting_definitions 2016-05-16 14:12:56 +02:00
Torkel Ödegaard
7f0fe31881 docs(): updated download links 2016-05-16 13:41:50 +02:00
bergquist
31698a1c55 Merge branch 'master' into alerting_definitions 2016-05-16 09:28:14 +02:00
Dan Cech
dac62ec560 fix rpm download link 2016-05-11 14:09:03 -04:00
bergquist
e69658128c docs(alerting): change api url layout 2016-05-11 14:08:45 +02:00
bergquist
c76c2f30a8 tech(alerting): add default values for alerts 2016-05-11 13:04:03 +02:00
bergquist
18bf2b2391 docs(alerting): add syles for optional params 2016-05-11 10:47:51 +02:00
Torkel Ödegaard
03663c5b28 docs(): updated download links 2016-05-11 10:23:17 +02:00
Torkel Ödegaard
959714a6ef feat(docs): updated what's new article 2016-05-10 20:33:42 +02:00
bergquist
dd47f7382a docs(alerting): initial info 2016-05-10 16:40:46 +02:00
Torkel Ödegaard
d676840258 docs(): added homebrew info to mac install docs 2016-05-10 16:02:00 +02:00
minkikim89
0c5abc491d Update index.md (#4956) 2016-05-10 08:44:18 +02:00
LaszloHont
a5e2e59385 Clarify admin_password (#4948) 
Closes #4923
 2016-05-09 13:44:11 +02:00
bergquist
35c73902da Merge branch 'master' into alerting_definitions 2016-05-09 11:34:56 +02:00
bergquist
74d5410a38 feat(alerting): add inital doc page 2016-05-06 15:59:38 +02:00
Carl Bergquist
e30745f19c Merge pull request #4881 from mmckinst/kairosdb_broken_image 
fix broken link for kairosdb image
 2016-05-04 11:05:05 +02:00
Mark McKinstry
37907e4110 fix broken link for kairosdb image 2016-05-02 12:31:39 -04:00
Torkel Ödegaard
3889052c31 docs(): added whats new in v3 guide 2016-05-02 15:35:49 +02:00
Torkel Ödegaard
af95993d6d feat(): updated download links 2016-05-02 09:54:11 +02:00
Torkel Ödegaard
6c340dcb65 docs(): updated download links 2016-04-29 11:24:43 +02:00
Tyler Mitchell
21d2a51cd3 typo 
tabs != tags
 2016-04-23 22:00:42 -07:00
Dan Cech
25b0773a94 fix broken link to grafana.net, standardize on https://grafana.net for links 2016-04-22 12:13:39 -04:00
Torkel Ödegaard
4832ecf3e7 docs(): updated download links 2016-04-15 09:25:09 -04:00
Torkel Ödegaard
f6d53df282 Merge branch 'master' of github.com:grafana/grafana 2016-04-13 17:33:17 -04:00
Torkel Ödegaard
e4374b1d56 docs(): updated download links 2016-04-13 17:33:03 -04:00
Torkel Ödegaard
7302ddaba5 docs(): fixed docs fixes #46688 2016-04-13 16:43:00 -04:00
Torkel Ödegaard
917fabbc9b docs(): updated links again 2016-04-12 09:52:12 -04:00
Torkel Ödegaard
782c484cad docs(): updated release links 2016-04-12 09:20:27 -04:00
Torkel Ödegaard
f93b039e42 change(grafana-cli): changed upgrade to update in command line, upgrade and upgrade-all will still work as aliases 2016-04-11 18:05:28 -04:00
utkarshcmu
41dcefb174 Fixed typos, lang 2016-04-06 07:26:22 -07:00
Daniel Lee
b39aa02b52 fix(plugins): Fix broken link in plugins readme 
Another link to setup instructions that it is broken.
 2016-04-05 12:05:14 +02:00
Daniel Lee
860e771493 fix(plugins): Fix broken link in plugins readme 
Can't find the DEVELOPMENT.md file so linked to 
http://docs.grafana.org/project/building_from_source/ instead.
 2016-04-05 12:01:13 +02:00
Torkel Ödegaard
e027770213 docs(): updated links to beta2 2016-04-04 17:49:33 -04:00
Torkel Ödegaard
601e90f5fe docs(): updated install instructions 2016-03-31 06:23:52 -07:00
Torkel Ödegaard
32bed83a17 docs(): updated 2016-03-30 08:01:54 -07:00
Torkel Ödegaard
545d3208c8 docs(): updated plugin docs 2016-03-30 16:56:22 +02:00
Peter Tripp
2cb3505dce Examples for listing CloudWatch resources in templates. 2016-03-27 17:20:33 -07:00
utkarshcmu
4ced5bbbc0 Fixed some minor typos in docs 2016-03-26 20:15:36 -07:00
bergquist
a531a1709e docs(plugin): add apps page 2016-03-24 11:55:36 +01:00
bergquist
f85a3ad44d docs(plugins): minor improvesments to plugin dev guide 2016-03-24 11:29:11 +01:00
bergquist
7f8643efde feat(cli): make all plugin commands subcommands 2016-03-21 10:01:07 +01:00
bergquist
35e53ee511 docs(plugin): add info about enabling apps 2016-03-18 09:48:26 +01:00
bergquist
b1881e5f54 docs(plugins): update links to new examples 2016-03-18 09:48:26 +01:00
bergquist
3c39a935f8 docs(plugins): docs for app plugins 2016-03-18 09:48:26 +01:00
bergquist
2b0499c968 docs(plugin): update link to datasource docs 2016-03-18 09:48:26 +01:00
Matt Toback
5af54c57ba Update admin.md 2016-03-17 14:31:55 -04:00
Bruno Binet
3486bf92eb [docs] typos 2016-03-16 11:56:19 +01:00
Mitsuhiro Tanda
01788e86e5 (cloudwatch) add document for new query 2016-03-11 18:18:14 +09:00
bergquist
0b6fee138a docs(configuration): add redis as session storage 2016-03-10 14:49:37 +01:00
utkarshcmu
4fbff99186 Implemented GetDataSourceIdByName API 2016-03-10 01:31:10 -08:00
Paul Mestemaker
d6ecf74db4 Update ldap.md 
Added clearer language on which versions offer LDAP support.
 2016-03-09 11:25:42 -08:00
utkarshcmu
4fae1958fa Fixed some typos 2016-03-08 07:28:25 -08:00
Utkarsh Bhatnagar
e5d400ebb9 Update data_source.md 2016-03-08 02:19:52 -08:00
bergquist
2a18430a45 docs(plugin): add table reponse format for queries 2016-03-08 09:26:31 +01:00
Utkarsh Bhatnagar
aef8dab4d9 Fixing language plus typos 2016-03-07 03:49:49 -08:00
bergquist
bcb7eff6fa docs(plugins): basic overview text 2016-03-07 12:16:52 +01:00
Torkel Ödegaard
08a45e9a3b docs(): docs update 2016-03-07 08:52:16 +01:00
bergquist
ad6837ee47 docs(plugins): small guide for developing plugins 2016-03-04 14:28:31 +01:00
bergquist
01d5bc73cc docs(plugins): add css to panel example 2016-03-04 13:11:05 +01:00
bergquist
73a49c463d docs(plugins): add placeholders for plugin docs 2016-03-04 13:11:05 +01:00
bergquist
09c29cdda5 docs(plugins): json formating 2016-03-04 13:11:05 +01:00
bergquist
67dec6a665 docs(plugins): json formating 2016-03-04 13:11:05 +01:00
bergquist
c6a1076e3a docs(plugins): json formating 2016-03-04 09:14:25 +01:00
bergquist
d318c84434 docs(plugins): add json formating 2016-03-04 08:47:22 +01:00
bergquist
c21a210198 docs(datasource): add request objects to docs 2016-03-04 08:45:46 +01:00
bergquist
01d3282838 docs(plugins): add initial documentation for datasource plugins 2016-03-03 13:22:09 +01:00
Utkarsh Bhatnagar
f2dabd0731 Updated Opentsdb docs for 2.2 support 2016-03-03 01:13:30 -08:00
Toby Brain
737896695c Fix IAM role documentation link 2016-03-03 15:33:52 +11:00
bergquist
8b64b2113e docs(plugins): improve install docs for plugins 2016-03-02 08:39:46 +01:00
bergquist
f78f7d6b37 docs(plugins): basic instructions for installing plugins 2016-03-01 10:42:49 +01:00
bergquist
2647f59df1 docs(plugins): add skeleton pages for plugins 2016-03-01 09:39:10 +01:00
bergquist
df8e56ddf8 docs(plugins): move plugins into seperate folder 2016-02-29 16:53:47 +01:00
utkarshcmu
936dd2eaaa Added relevant docs and changes 2016-02-28 01:50:10 -08:00
Andrew MacDonald
ce6c67f9bc Fix the path to grafana-webserver in the Debian install docs. 2016-02-23 16:06:56 -08:00
bergquist
653d4b1d6a chore(docs): remove old http api docs 2016-02-18 12:53:43 +01:00
utkarshcmu
c3fc340c09 Merge branch 'master' of https://github.com/utkarshcmu/grafana into docs-refac 2016-02-10 23:12:41 -08:00
Mitsuhiro Tanda
2cce057df1 (prometheus) add query result template query 2016-02-09 01:37:43 +09:00
Carl Bergquist
d03ae3bfe5 Merge pull request #3944 from doubledutch/github-api-url 
Add github api_url to github auth docs
 2016-02-05 14:13:17 +01:00
utkarshcmu
0201b9769c Merged with grafana/master 2016-02-05 01:50:47 -08:00
utkarshcmu
4ff6748eb4 Linked docs from main nav 2016-02-05 01:47:34 -08:00
bergquist
8ff997594f fix(tablepanel): change to using two thresholds 
fixes #3878
 2016-02-05 10:30:46 +01:00
utkarshcmu
616a6bec38 Added api heading in the main menu 2016-02-05 01:15:09 -08:00
Kevin Pike
15fb56e607 Add github api_url to github auth docs 2016-02-04 13:46:02 -08:00
utkarshcmu
59a384b453 Merge branch 'master' of https://github.com/grafana/grafana into metadata 2016-02-04 13:34:32 -08:00
Masafumi Yokoyama
c90619c665 doc: fix a broken link 2016-02-03 23:10:48 +09:00
utkarshcmu
952e4dab3e Arranged http_api docs in a better way 2016-02-02 22:59:22 -08:00
utkarshcmu
8952c7c9d1 Merge branch 'master' of https://github.com/grafana/grafana into metadata 2016-02-02 11:56:17 -08:00
Prayag Verma
7c61ed99ae Fix typo in docs 
Remove extra `of`
 2016-02-02 17:47:06 +05:30
utkarshcmu
338afc80d5 Merge branch 'master' of https://github.com/grafana/grafana into metadata 2016-02-01 10:32:36 -08:00
bergquist
a2c00f1cc5 docs(playlist): add docs about tags in playlist 2016-01-29 19:44:02 +01:00
utkarshcmu
972ac99b7c Added more metadata 2016-01-28 09:53:19 -08:00
utkarshcmu
58121d89fc Updated http_api docs 2016-01-27 22:02:33 -08:00
Carl Bergquist
251bf7a2b4 Merge pull request #3840 from utkarshcmu/stats 
Grafana stats view as mentioned in #3812
 2016-01-27 19:41:10 +01:00
Daniel Lee
98982b7a74 docs(singlestat) updates threshold explanation 
The implementation of thresholds changed after fixing #3248. Docs
updated to reflect and explain the change.
 2016-01-26 21:00:13 +01:00
utkarshcmu
2190392e05 Added grafana_admins count 2016-01-25 00:39:31 -08:00
utkarshcmu
a621c0d273 Added docs for stats api 2016-01-25 00:02:05 -08:00
Mitsuhiro Tanda
d0074b25db (prometheus) add explanation about incompatibility of metric find query 2016-01-20 18:30:17 +09:00
Michael Sambol
3418db1dcd Fix grammatical error in graphite datasource doc 
Replace "you" with "your".
 2016-01-18 10:41:14 -06:00
utkarshcmu
caa26f594e Added Orgs API 2016-01-14 14:40:12 -08:00
Torkel Ödegaard
6c6c3a5081 feat(plugins): more work on how plugins expose directives 2016-01-14 12:35:31 +01:00
Carl Bergquist
f7fecdc6de Merge pull request #3655 from grafana/playlist 
Persistable playlists

closes #515
closes #1137
 2016-01-12 15:20:43 +01:00
Utkarsh Bhatnagar
39aca0f038 Update playlist.md 2016-01-08 23:52:51 -08:00
bergquist
d0841919ea docs(plugins): fixes typo 2016-01-08 10:55:22 +01:00
bergquist
a23e60ab69 docs(plugins): adds plugin page 2016-01-08 10:53:39 +01:00
Torkel Ödegaard
3362d6bc56 Merge branch 'docs-2.6' 2016-01-08 10:25:20 +01:00
Torkel Ödegaard
19a5e425cf docs: fixed building from source go dependency verison 2016-01-08 10:22:57 +01:00
bergquist
6c8d084664 Merge branch 'ssl-for-mysql' of https://github.com/improbable-io/grafana into improbable-io-ssl-for-mysql 2016-01-07 17:08:31 +01:00
Henri DF
5af3fe93f2 Docs: add example with filter in ES template 2016-01-04 21:48:47 -08:00
Daniel Low
ea566fff24 Add TLS for mysql 
Use ssl_mode for mysql and add docs
add docs for the new parameters in config

Tolerate ssl_mode without client authentication

Client cert is not necessary for a SSL connection. So we tolerate
failure if client cert is not provided.
Improve error message if missing server_cert_name and mode is not
skip-verify.
 2015-12-22 12:42:52 +00:00
Carl Bergquist
333f9101a0 Merge pull request #3458 from improbable-io/use-memcache-for-session 
Add memcache as session provider
 2015-12-17 15:56:15 +01:00
utkarshcmu
3a6e8a535c Fixed typos 2015-12-16 02:30:53 -08:00
Torkel Ödegaard
f163ceffd0 fix(elasticsearch): fixes spelling of lucene, #3519 2015-12-15 08:29:24 +01:00
Torkel Ödegaard
33395d530d docs(): updated downloads for 2.6 and whats new in 2.6 article 2015-12-14 15:45:00 +01:00
Torkel Ödegaard
e334107c7d docs(): added whats new in 2.6 article 2015-12-14 15:15:56 +01:00
Torkel Ödegaard
56c3dd3652 docs(influxdb): updated influxdb docs 2015-12-14 14:16:22 +01:00
Torkel Ödegaard
6ddd458402 docs(elasticsearch): updated elasticsearch with info about templating and pipeline metrics 2015-12-14 13:55:16 +01:00
Torkel Ödegaard
ee328667d0 docs(table): updated table docs 2015-12-14 13:40:06 +01:00
Matt Toback
62fe5cdbaa New table panel doc 2015-12-11 14:20:21 -05:00
Daniel Low
ed16914715 Add memcache as session provider 2015-12-08 13:35:09 +00:00
Torkel Ödegaard
891d7c134c Merge pull request #3205 from mtanda/cloudwatch_suggest_fix 
(cloudwatch) fix dimension value suggestion
 2015-12-03 17:17:07 +01:00
Mitsuhiro Tanda
eb5822bc7c update cloudwatch docs 2015-12-04 01:04:50 +09:00
Torkel Ödegaard
8e0bba4f99 fix(templating): minor fix to default property name, fixes #3378 2015-12-01 09:01:44 +01:00
Torkel Ödegaard
4cc61d10ff fix(docs): fixed typo in installing docs fixes #3379 2015-12-01 08:59:30 +01:00
utkarshcmu
ca5d0496ee Validated HTTP responses 2015-11-23 19:19:26 -08:00
Torkel Ödegaard
4a3f50cef7 fix(docs): minor fix to http docs, fixes #3301 2015-11-21 10:07:33 +01:00
Christoph Krybus
b0c01369c5 Fix recommended graphite version for better performance 
There is no 0.9.13 graphite release, only 0.9.14.
 2015-11-19 13:44:46 +01:00
utkarshcmu
e5931e264b Updated http_api docs 2015-11-16 06:56:46 -08:00
Torkel Ödegaard
ee5ebe2e81 Merge pull request #3224 from mattttt/patch-6 
Updating singlestat article to include troubleshooting
 2015-11-13 09:32:42 +01:00
Torkel Ödegaard
a71b681e80 fix(docs): minor docs fix 2015-11-13 09:32:16 +01:00
Torkel Ödegaard
cc125f5fd7 change(shortcuts): changed CTRL+F search shortcut to just F 2015-11-13 09:25:31 +01:00
Matt Toback
7888c1c614 Update singlestat.md 2015-11-12 12:35:45 -05:00
Matt Toback
b43315c36d Update singlestat.md 2015-11-12 12:07:09 -05:00
Matt Toback
fbd6417c8a Updating singlestat article to include troubleshooting 2015-11-12 12:03:33 -05:00
Utkarsh Bhatnagar
74b10a42ee Fixed broken links in the doc page 2015-11-02 10:29:42 -08:00
Utkarsh Bhatnagar
f14ef22bb6 Fixed doc links 2015-11-02 10:25:33 -08:00
Utkarsh Bhatnagar
e8c9b0806a Added templating, timepicker, panel docs 2015-11-02 10:15:40 -08:00
Utkarsh Bhatnagar
f54615ed46 Included rows JSON and TODO headers 2015-11-02 00:21:59 -08:00
utkarshcmu
4c1b6f3059 Fixed a typo 2015-11-01 23:55:03 -08:00
Utkarsh Bhatnagar
ada641090f Explained basic JSON fields 2015-11-01 23:53:24 -08:00
utkarshcmu
3a021a87a1 Added JSON of new dashboard 2015-11-01 23:17:23 -08:00
utkarshcmu
5100339604 Initialized dashboard JSON doc. 2015-11-01 22:58:14 -08:00
Vitaliy Fuks
acb5340ffb Fixed typo in OpenTSDB's "metasync" documentation 2015-10-31 18:07:24 -04:00
Torkel Ödegaard
6a01cd56ca Merge pull request #3085 from mtanda/cloudwatch_template_doc 
Add templating explanation to CloudWatch docs.
 2015-10-31 11:37:01 +01:00
Utkarsh Bhatnagar
03130e1217 Update opentsdb.md 
As we merged, changes with auto suggestions in the master branch. Update docs respectively.
 2015-10-30 22:11:17 -07:00
Torkel Ödegaard
0a0a0776e4 Merge pull request #3088 from utkarshcmu/suggest-opentsdb 
Tag suggestions fixed for v2.1.1 & above by using Suggest Api.
 2015-10-30 10:34:44 +01:00
utkarshcmu
8b9d13491f Fixed some more typos in docs 2015-10-30 02:07:08 -07:00
Mitsuhiro Tanda
8a252774ce Update cloudwatch.md, add explanation about templating 2015-10-29 23:51:27 +09:00
Torkel Ödegaard
f8a1c7c8a1 docs(cloudwatch): updated docs with info about #3080 2015-10-29 12:22:01 +01:00
utkarshcmu
2f09ef2970 Fixed typos in 2.5v doc 2015-10-28 04:27:51 -07:00
Torkel Ödegaard
6ea2c08ecb docs(): minor docs fix 2015-10-28 11:50:22 +01:00
Torkel Ödegaard
1685e7cea4 docs(): update to install docs and whats new in 2.5 2015-10-28 11:08:12 +01:00
Torkel Ödegaard
6397b8c1ef docs(): updated version to 2.5.0 2015-10-28 09:31:57 +01:00
ubhatnagar
6af86152e6 Removed typos in cloudwatch docs 2015-10-26 21:02:04 -07:00
Matt
da31fffb16 Update timerange.md 2015-10-26 14:05:44 -04:00
Matt
c97e3ec7ae Updates to timepicker docs for 2.5 release 
Updated images to be in separate PR.
 2015-10-26 14:03:26 -04:00
Torkel Ödegaard
da3d5375b8 feat(ldap): refactoring of PR #2928 updated docs 2015-10-26 16:21:03 +01:00
Torkel Ödegaard
59bd029e46 docs(cloudwatch): minor cloudwatch fix 2015-10-26 15:51:34 +01:00
Torkel Ödegaard
1dbf0ad976 docs(cloudwatch): initial cloudwatch docs, closes #2900 2015-10-26 15:44:14 +01:00
Torkel Ödegaard
7477667df1 docs(elasticsearch): initial elasticsearch docs, closes #2862 2015-10-26 14:21:38 +01:00
Torkel Ödegaard
a5c742cee5 docs(elasticsearch): began work on elasticsearch docs #2862 2015-10-26 13:36:00 +01:00
Torkel Ödegaard
052c9aca15 Merge branch 'master' of github.com:grafana/grafana 2015-10-26 12:16:13 +01:00
Torkel Ödegaard
b0e975bfce Merge pull request #3025 from utkarshcmu/docs 
Added OpenSuse documentation
 2015-10-26 08:22:52 +01:00
mlbarrow
21f3f859b9 Update influxdb.md 
Typo fix
 2015-10-24 20:58:19 -07:00
Utkarsh Bhatnagar
54be4c5e2c Made installation doc consistent 2015-10-23 23:21:00 -07:00
ubhatnagar
45cdbe0a18 Rearranged installation docs for OpenSuse 2015-10-23 23:03:58 -07:00
ubhatnagar
6c76e9728e Added OpenSuse installation command 2015-10-23 22:53:30 -07:00
ubhatnagar
7205cf8ce1 Fixed 3014 2015-10-23 07:29:15 -07:00
ubhatnagar
1e2e4ba3ad Fixed other docs typos 2015-10-21 22:09:07 -07:00
ubhatnagar
aaf4b1a399 Fixed typos in guides. 2015-10-21 21:13:39 -07:00
ubhatnagar
a5e3d7a94b Fixed datasources docs typos 2015-10-21 20:58:04 -07:00
Torkel Ödegaard
1ff3c3be84 Merge pull request #2952 from Krinkle/fixup 
docs(): Fix changelog link in whats-new-in-v2-1
 2015-10-17 12:44:09 -04:00
Scott M. Likens
bd77fd92bb I'm not sure what a dashboard is ... 2015-10-15 19:45:40 -07:00
Timo Tijhof
267417d6a8 docs(): Fix changelog link in whats-new-in-v2-1 
The quotes turn the value into a title attribute rather than href attribute,
thus on http://docs.grafana.org/guides/whats-new-in-v2-1/ this link was
rendered as <a href title="https://github.com/...">CHANGELOG.md</a>
which when clicked goes back to itself (not to GitHub).
 2015-10-14 14:00:25 -04:00
anryko
b68987dcde Fixed configuration example for Github OAuth team_ids. 2015-10-09 17:05:46 +02:00
Torkel Ödegaard
9b5a0a54cf minor docs fix 2015-10-09 08:28:33 +02:00
Torkel Ödegaard
f11785001c docs: minor fix 2015-10-06 17:51:22 +02:00
Ivan Babrou
0dc0e03c4c Add suggest_tagk() and suggest_tagv() to OpenTSDB datasource (#2840) 2015-10-04 12:54:43 +01:00
Jimmi Dyson
7cadb9012a Switch to png image 2015-09-30 16:45:38 +01:00
Jimmi Dyson
0c222c4e8c Fix Prometheus test connection 2015-09-30 16:44:24 +01:00
Jimmi Dyson
59dbe45784 Fix typo in docs 2015-09-30 14:20:58 +01:00
Jimmi Dyson
055efa3904 Add prometheus docs 2015-09-30 12:42:48 +01:00
Torkel Ödegaard
3eddfc028e Merge branch 'patch-2' of https://github.com/cagdascirit/grafana 2015-09-21 11:32:36 +02:00
Torkel Ödegaard
8d87db58c6 docs(): added link to external install tutorial / article 2015-09-21 09:04:59 +02:00
Cagdas Cirit
c26209d579 Update debian.md 2015-09-17 18:25:36 +02:00
Torkel Ödegaard
7c25edc7b2 docs(): fixed iframe snapshot links in docs, fixes #2682 2015-09-08 15:24:20 +02:00
Torkel Ödegaard
2725053c82 docs(): fixed iframe snapshot links in docs, fixes #2682 2015-09-08 15:19:59 +02:00
Torkel Ödegaard
f29471521c Merge pull request #2663 from victorhooi/patch-1 
Add note about phantomjs binary and PNG rendering.
 2015-09-04 08:40:53 +02:00
Julien Danjou
63f9dc826f doc: fix link to basic concepts 2015-09-03 14:01:32 +02:00
Victor Hooi
b80adcc00a Add note about phantomjs libraries. 2015-09-03 16:35:49 +10:00
Victor Hooi
68a7c3fa3b Add note about phantomjs binary and PNG rendering. 2015-09-03 16:29:58 +10:00
Baptiste Fontaine
28474d9340 influxdb doc: typo fixed 2015-09-01 12:47:26 +02:00
Torkel Ödegaard
3e0c66edab docs(): updated download links in docs 2015-08-24 10:05:05 +02:00
Torkel Ödegaard
a4ff1e4f33 docs(): updated version in install docs 2015-08-20 15:20:26 +02:00
Torkel Ödegaard
952a69abca docs(tutorial): updated hubot tutorial 2015-08-19 13:53:15 +02:00
Trent White
2f5115ca45 Update hubot_howto.md 2015-08-18 09:37:51 -04:00
Trent White
66878a9b48 Update hubot_howto.md 2015-08-18 09:34:31 -04:00
Trent White
333952a231 Update hubot_howto.md 2015-08-18 09:34:08 -04:00
Torkel Ödegaard
4f8cea6e2d docs(): added tutorial article on hubot and grafana integration 2015-08-18 14:39:04 +02:00
Torkel Ödegaard
d4432ddd64 feat(mixed datasources): feature ready to merge to master, closes #436 2015-08-18 08:22:00 +02:00
Torkel Ödegaard
2f849be9d8 docs(): minor tweaks to new tutorial 2015-08-14 09:41:07 +02:00
Torkel Ödegaard
f784551e20 docs(): Began work on stack install and config tutorial 2015-08-13 08:52:50 +02:00
Torkel Ödegaard
a3d9169930 docs(): minor update 2015-08-13 08:00:27 +02:00
Torkel Ödegaard
5aee981590 Merge branch 'master' of https://github.com/mattttt/grafana 
Conflicts:
	docs/sources/installation/debian.md
	docs/sources/installation/ldap.md
 2015-08-12 16:30:48 +02:00
Anton Gilgur
e4baef94bc docs(ldap): Clarify LDAP features and sample config 
* Clarify certain features, such as multiple mappings
* Fixup ldap.toml sample config
* Fixup docs README's port number
* Fixup bad link from LDAP docs to Configuration docs
* Fixup some spelling, grammar, and line endings
 2015-08-11 19:57:53 -07:00
Trent White
8c05f9cf3e Merge pull request #11 from mattttt/trent-update 
add text panel page
 2015-08-11 16:52:15 -04:00
Trent White
ebcab0f26e add text panel page 2015-08-11 16:50:33 -04:00
Matt
14996bd08b Update templating.md 2015-08-11 15:57:36 -04:00
Matt
dd9fb9d526 Update templating.md 2015-08-11 15:56:18 -04:00
Matt
f3ffed673b Merge pull request #10 from mattttt/build-patch-1 
Reformatted a confusing part of of the running grafana locally section
 2015-08-11 15:47:38 -04:00
Matt Toback
5b342dd229 Reformatted a confusing part of of the running grafana locally section 2015-08-11 15:41:12 -04:00
Trent White
04795709a3 formatting tweak, added datasource overview blurb. 2015-08-11 15:30:13 -04:00
Matt Toback
511a592ec8 Added patch from ct 2015-08-11 14:58:30 -04:00
Matt
d132d3abfd Merge pull request #7 from mattttt/mattttt-docs 
Mattttt docs
 2015-08-11 14:41:21 -04:00
raj dutt
c6798892b8 Update screencasts.md 
tweaks
 2015-08-11 14:26:04 -04:00
Matt Toback
eea5b026ce Sanity checked and verified for merge 2015-08-11 14:17:56 -04:00
raj dutt
331e858ed3 Update gettingstarted.md 2015-08-11 14:04:14 -04:00
Trent White
3d602a2558 Merge remote-tracking branch 'origin/master' 2015-08-11 14:01:03 -04:00
Trent White
14386a2f62 Merge branch 'trent-docs' 
Conflicts:
	docs/sources/reference/templating.md
 2015-08-11 13:59:46 -04:00
raj dutt
4e91e05470 Update gettingstarted.md 2015-08-11 13:58:44 -04:00
Trent White
ea0bec8bf2 update content on annotations 2015-08-11 13:51:27 -04:00
raj dutt
c2e8a1d733 Update singlestat.md 2015-08-11 13:49:24 -04:00
raj dutt
c6155723a1 Update playlist.md 2015-08-11 13:43:36 -04:00
Trent White
8c64afc81e update to templating doc 2015-08-11 13:42:40 -04:00
raj dutt
eafd1d8c53 Update templating.md 2015-08-11 13:33:01 -04:00
raj dutt
df0673f907 Update templating.md 2015-08-11 13:31:49 -04:00
raj dutt
ed536f18ee Update basic_concepts.md 2015-08-11 13:07:30 -04:00
Matt Toback
96590f591c Updates to dashlist article 2015-08-11 12:34:18 -04:00
Trent White
32bfcbcdbc updates to screencasts page, with descriptions of each 2015-08-11 11:43:45 -04:00
Trent White
3af451caeb Merge pull request #4 from mattttt/trent-docs 
added pages, touched up some images and content  in data-sources section
 2015-08-11 10:15:59 -04:00
Trent White
ae953f2420 added pages, touched up some images and content in data-sources section 2015-08-11 10:12:58 -04:00
Torkel Ödegaard
809562c874 updated install docs for 2.1.1 release 2015-08-11 11:12:06 +02:00
Matt
e53c8100a3 Merge pull request #3 from mattttt/mattttt-docs 
Adding additional pages and updates from google doc
 2015-08-10 23:20:15 -04:00
Matt Toback
2b59724ea8 Adding additional pages and updates from google doc 2015-08-10 18:19:56 -04:00
Trent White
ca65671553 add basic concpets doc 2015-08-10 17:51:29 -04:00
Trent White
a4be75f410 adding Raj edits/additions as well as initial round of pages I created 2015-08-10 17:44:08 -04:00
Denis Doria
696f8451cf Update documentation with $col alias 2015-08-10 08:12:12 +02:00
Torkel Ödegaard
bf6444c585 docs(): docker upgrade notice 2015-08-04 20:42:14 +02:00
Torkel Ödegaard
8c1b145358 docs(): updated install docs with 2.1 download links 2015-08-04 17:00:26 +02:00
Torkel Ödegaard
49c1d1a4ca docs(ldap): fixed minor issue in ldap example config doc 2015-08-01 10:32:36 +02:00
Torkel Ödegaard
66a37aa945 docs(): updated whats new in 2.1 doc 2015-07-31 15:22:13 +02:00
Torkel Ödegaard
0d3321c686 docs(): updated whats new in grafana 2.1 article 2015-07-31 10:09:32 +02:00
Torkel Ödegaard
be6ddb08bd docs(): added auth proxy to config docs 2015-07-30 10:37:49 +02:00
Torkel Ödegaard
fb81a4f318 Merge pull request #2299 from espenfjo/kairosdb-sensible-tag-values 
KairosDB: Update the template functionality to cohere with the very closely related OpenTSDB plugin
 2015-07-29 20:46:13 +02:00
Torkel Ödegaard
95bce39751 docs(): updates to whats new arcticle, and changed one screenshot 2015-07-29 15:36:04 +02:00
Torkel Ödegaard
a34af84176 docs(): fixed wording in sentence in whats new in 2.1 article 2015-07-29 15:00:53 +02:00
Torkel Ödegaard
610a94ea03 docs(): lots of updates to whats new in 2.1 doc article 2015-07-29 10:24:46 +02:00
Torkel Ödegaard
cd832ea77c Merge pull request #2384 from sbengo/improved_http_api_doc 
Added docs to http_api
 2015-07-23 09:43:02 +02:00
sbengo
82c7764679 Added docs to http_api 
Finished the documentation of API HTTP

Notes: 
· Data source proxy calls not documented - Too long request/response text.
· Dashboard from JSON file no do documented - Need more study to underestand how it works.
 2015-07-22 13:11:55 +02:00
Torkel Ödegaard
a386733c04 docs(): updates to docs 2015-07-21 16:19:49 +02:00
Trent White
381e9dac34 new images for regex color and negative y transform 2015-07-21 16:19:49 +02:00
Torkel Ödegaard
4acfa1faef Merge pull request #2378 from sbengo/improved_http_api_doc 
Added details on api documentation
 2015-07-21 12:15:22 +02:00
sbengo
b9085c1522 Added details on api documentation 
Added example request and example response of sections: Dashboard, Datasources, Organisation.

If you agree, I will complete the documentation following the same formatting.
 2015-07-21 12:01:04 +02:00
raj dutt
0c25c1f0ca Update templating.md 2015-07-20 20:05:56 -04:00
Matt
a7a2a166e6 Relative link for What's New in v2 was incorrect 2015-07-20 17:09:58 -04:00
Torkel Ödegaard
5b0585ac7f feat(ldap): removed ssl_server_name and added some validation to ldap config, #1450 2015-07-16 12:58:30 +02:00
Torkel Ödegaard
9afdea8d2a feat(ldap): added config options for ssl skip verify, and ssl server name, #1450 2015-07-16 11:59:26 +02:00
raj dutt
a065f93777 Update singlestat.md 2015-07-15 14:27:55 -07:00
Torkel Ödegaard
e1345337ac docs(): small fix to time range doc page 2015-07-15 17:41:45 +02:00
Torkel Ödegaard
b891677ba5 docs(ldap): added ldap integration docs and config examples, #1450 2015-07-15 14:48:39 +02:00
Torkel Ödegaard
567a42a756 docs(http_api): updated http docs and mentioned basic auth option 2015-07-13 22:20:58 +02:00
Torkel Ödegaard
ca1cd89190 Updated singlestat docs again 2015-07-10 15:53:39 +02:00
Torkel Ödegaard
9f8eae908d Updated singlestat docs 2015-07-10 15:34:54 +02:00
Matt
3774114a4c Update Singlestat Docs 
Need some additional clarification in Spark Line and Value to text before this is merged.
 2015-07-10 09:13:45 -04:00
Torkel Ödegaard
4bc5b37c09 Merge pull request #2321 from gmembre/master 
Adding GOPATH
 2015-07-10 13:33:15 +02:00
Torkel Ödegaard
83b67c0693 Fixed link to CLA, Fixes #2326 2015-07-10 13:31:21 +02:00
gmembre
3fa228dcbb Correcting typo 2015-07-09 22:49:27 +02:00
gmembre
14e25100d4 Adding GOPATH 2015-07-09 22:17:12 +02:00
Torkel Ödegaard
b2c0eefbbc Merge pull request #2313 from alaverty/master 
Fixed invalid json example, added missing comma
 2015-07-09 22:05:35 +02:00
Torkel Ödegaard
8eee0d574c Merge branch 'influxdb-09-fields-enhancements' 2015-07-09 17:17:46 +02:00
Alex Laverty
dca45f177f Fixed invalid json example, added missing comma 2015-07-09 11:50:29 +10:00
Torkel Ödegaard
597c1f6a41 feat(influxdb): began work on some influxdb enhancements, #2311 2015-07-08 17:41:36 +02:00
Torkel Ödegaard
afcc388d8a Merge pull request #2308 from davewongillies/config_mysql_sessions 
Minor update to documentation for MySQL sessions
 2015-07-08 14:48:17 +02:00
David Gillies
5cd1c5c522 Minor update to documentation for MySQL sessions 2015-07-08 22:40:43 +10:00
Torkel Ödegaard
63f8800007 fix(docs): Updated getting started docs, Closes #2273, Closes #1978 2015-07-08 14:17:53 +02:00
Torkel Ödegaard
5d7c485991 fix(templating): can now use template vars in collapsed row title, Fixes #2305 2015-07-08 13:44:36 +02:00
Torkel Ödegaard
3b39c43193 Updated docs version and version fragment 2015-07-08 11:06:11 +02:00
Torkel Ödegaard
b746b63036 Updated config docs with info about [dashboards.json] section , #2302 2015-07-08 10:53:06 +02:00
Espen Fjellvær Olsen
3e05eb23fd Update documentation based on templating changes 2015-07-08 09:29:54 +02:00
Dieter Plaetinck
ac37b54ddb fix datasource api docs 
reflects change in e2f6633d57
 2015-07-07 16:07:56 -07:00
Torkel Ödegaard
f6ad386ba7 Fixed capital G in Graphite in docs, reviewed annotation docs, Closes #2275 2015-07-07 17:14:57 +02:00
Torkel Ödegaard
24e527ae02 Updated Graphite docs, Closes #2271 2015-07-07 14:50:23 +02:00
Torkel Ödegaard
a4b8a88ae5 Worked on templating docs, Closes #2274 2015-07-06 15:01:57 +02:00
Torkel Ödegaard
3c86c9908c Added docs for dashboard list panel, #2276 2015-07-06 12:24:11 +02:00
Dieter Plaetinck
582ebf25f9 fix config flag 2015-07-03 17:27:55 -07:00
Torkel Ödegaard
fc81cda971 Updated OpenTSDB docs, Closes #2272 2015-07-03 15:13:06 +02:00
Torkel Ödegaard
7a030e0c3b Finished improving InfluxDB docs, Closes #2270 2015-07-03 15:09:46 +02:00
Torkel Ödegaard
69c027156c Updated influxdb docs, adding docs specific to influxdb 0.9, #2270 2015-07-02 17:13:12 +02:00
Torkel Ödegaard
e8c65dc384 Updated OpenTSDB docs 2015-06-30 15:37:59 +02:00
Torkel Ödegaard
9266d3789b Merge remote-tracking branch 'origin/kariosdb' 
Conflicts:
	public/test/test-main.js
 2015-06-25 18:34:41 +02:00
Masaori Koshiba
74b8e8244a Add docs of KairosDB Datasource Plugin 2015-06-25 06:54:47 +09:00
Torkel Ödegaard
cfeba99776 Merge branch 'patch-1' of https://github.com/greggsoft/grafana 2015-06-19 13:04:21 -04:00
Torkel Ödegaard
c0b4f7b6d2 updated graphite docs, Closes #2165 2015-06-19 13:03:09 -04:00
Mikhail Menshenin
5da656e559 Missed double quote fix 2015-06-18 10:05:29 +05:00
Shaoxuan Zhang
d23762e06b Update configuration.md 
Mention replacing `.` with `_` with environment variable override.
 2015-06-17 17:57:23 -10:00
Torkel Ödegaard
6deaa87a4c mention fpm in build from source docs, Closes #2145 2015-06-11 07:59:57 +02:00