518 Commits

Author	SHA1	Message	Date
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