10292 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Torkel Ödegaard	5c9810fba4	docs: added in app docs & links to annotation docs	2017-05-05 11:30:44 +02:00
Torkel Ödegaard	2479ad262e	ux: updated look of info box	2017-05-05 09:16:28 +02:00
Torkel Ödegaard	e75bc5d39a	docs: added templating docs link to app	2017-05-05 08:56:19 +02:00
Torkel Ödegaard	6ee11f1172	heatmap: minor update	2017-05-05 07:05:11 +02:00
Torkel Ödegaard	f167d459fe	Merge branch 'heatmap-refactor'	2017-05-04 19:56:29 +02:00
Torkel Ödegaard	5acabc6ccb	heatmap: refactoring	2017-05-04 19:56:20 +02:00
Trent White	b4a8678cae	remove duplicate paragraph, couple word tweaks	2017-05-04 10:34:19 -04:00
Torkel Ödegaard	61b51c0cbf	heatmap: refactoring	2017-05-04 16:03:47 +02:00
Torkel Ödegaard	0390a7c17b	docs: fixed docs intro	2017-05-04 12:36:34 +02:00
Torkel Ödegaard	11959f0c4c	Merge branch 'master' of github.com:grafana/grafana	2017-05-04 12:13:43 +02:00
Torkel Ödegaard	dbcd19bbce	docs: minor update to OpenTSDB docs	2017-05-04 12:12:55 +02:00
柯豪	b7a1ff753a	update name for AWS credentials (#8287)	2017-05-04 11:44:36 +02:00
Torkel Ödegaard	0bab1fd088	Merge branch 'templating-docs', closes #8243	2017-05-04 11:17:39 +02:00
Torkel Ödegaard	cbba692962	docs: influxdb docs update	2017-05-04 11:15:48 +02:00
Torkel Ödegaard	e80e0c044b	docs: updated elasticsearch docs	2017-05-04 10:19:00 +02:00
Daniel Lee	e08188929d	docs: update to alert notifications	2017-05-03 22:27:10 +02:00
Daniel Lee	b61de0cddc	docs: fix API alerting docs	2017-05-03 17:24:27 +02:00
Torkel Ödegaard	287cd83e76	docs: grammarly fixes	2017-05-03 16:34:51 +02:00
Torkel Ödegaard	59fdda6559	docs: minor update to prometheus docs	2017-05-03 15:53:31 +02:00
Torkel Ödegaard	ed8d284715	docs: updated prometheus docs	2017-05-03 15:50:38 +02:00
Torkel Ödegaard	e6c29391c6	docs: improved Graphite templating docs	2017-05-03 14:20:59 +02:00
Torkel Ödegaard	2304a710bf	docs: templating doc wip	2017-05-03 14:09:04 +02:00
Daniel Lee	186a5e9d6f	Merge pull request #8274 from sliceratwork/master ... Update style guide	2017-05-03 11:04:52 +02:00
Andrei Stefan	c57ec23a66	fix broken layout for styleguide icons tab	2017-05-03 11:46:08 +03:00
Torkel Ödegaard	b042c53980	ux: updated heatmap icon	2017-05-03 08:56:51 +02:00
Vladimir Gordiychuk	deab4a378a	bug: MetricSegment lost information about type (#8278) ... Fixed #8277	2017-05-03 08:22:30 +02:00
Daniel Lee	44f76fdabc	Merge pull request #8275 from jonfreedman/patch-1 ... chore: add comment to clarify that org_id usage	2017-05-02 17:07:36 +02:00
Jon Freedman	6ebb31bed4	chore: add comment to clarify that org_id usage ... As described here: https://community.grafana.com/t/many-to-many-group-dn-org-role-mapping-in-ldap-config/729/2 org_id can be used to allow multiple group_dn's to map to the same org_role provided the org_id differs.	2017-05-02 15:45:48 +01:00
Torkel Ödegaard	c1de972eb5	docs: wip templating docs	2017-05-02 16:22:31 +02:00
Andrei Stefan	53ccc6f48f	fix theme switching in style guide	2017-05-02 16:45:34 +03:00
Andrei Stefan	f43c749422	add plugin authoring tab in style guide	2017-05-02 16:15:28 +03:00
Andrei Stefan	ad3da0f47c	add icon guide	2017-05-02 15:57:02 +03:00
Dan Cech	665cf55e6e	make generic oauth provider flexible enough to handle bitbucket's oauth implementation (#8248)	2017-05-02 14:37:56 +02:00
Daniel Lee	b4cfb225cf	tech: updates log15 vendor packages ... Fixes #8262	2017-05-02 12:47:32 +02:00
Daniel Lee	ac6c93b3da	docs: add publish bash script	2017-05-02 10:20:09 +02:00
Torkel Ödegaard	0fd96b951a	wip: heatmap refactor	2017-05-02 09:55:18 +02:00
Daniel Lee	83c138f575	docs: fix mistake in api docs	2017-05-02 09:39:50 +02:00
rogerswingle	02455753b5	Specify region for s3 (#8251)	2017-05-01 19:22:20 +02:00
Torkel Ödegaard	88dd8af4ce	docs: Updates to screencasts & sharing docs	2017-04-28 13:43:00 +02:00
Torkel Ödegaard	4f9f186575	docs: overhauled annotation docs and moved some of the data source specific annotation docs to the respective data source doc pages, closes #1111	2017-04-28 12:51:21 +02:00
Torkel Ödegaard	c46b73538c	docs: minor update to troubleshooting guide, closes #8242	2017-04-28 11:16:05 +02:00
Torkel Ödegaard	0ac9ec8f7e	docs: added restore instructions to backup section in upgrading doc article, closes #5680	2017-04-28 11:05:14 +02:00
Daniel Lee	c6d5259c6d	changelog: add note for #6564	2017-04-28 11:01:54 +02:00
Torkel Ödegaard	26f4a8e5a4	docs: added links to upgrading article	2017-04-28 10:58:26 +02:00
Torkel Ödegaard	a93fa0acde	docs: Added general upgrading docs / guide, closes #5905	2017-04-28 10:52:50 +02:00
Torkel Ödegaard	b14c3d63e4	docs: added missing white space to config docs, #7073	2017-04-28 09:21:47 +02:00
Torkel Ödegaard	24e3777894	docs: updated make file for docs to support specifying env and version	2017-04-27 12:17:22 +02:00
Torkel Ödegaard	f5a6c306a6	docs: worked on supporting doc versions	2017-04-27 09:58:45 +02:00
Mitja Z	c92d719a72	added support for listening on unix socket #4030 (#8221)	2017-04-27 08:54:21 +02:00
Yaron de Leeuw	d4f7a2bc99	minor code style: use strings.Replace fourth argument in influxdb (#8225) ... Remove 5 lines from the codebase and an unecessary function, by calling `strings.Replace` with -1 for the fourth argument. A better alternative to what was merged in #8037	2017-04-27 08:51:43 +02:00