3572 Commits

Author	SHA1	Message	Date
bergquist	1181e96799	merge create user handlers	2018-06-15 21:23:57 +02:00
bergquist	da91b91b4b	transactions: start sessions and transactions at the same place ... this make it possible for handler to use `withSession` when transactions is not nedded and `inTransactionCtx` if its needed without knowing who owns the session/transaction	2018-06-15 20:52:57 +02:00
bergquist	09e71e00a3	sql: adds tests for InTransaction	2018-06-15 12:46:20 +02:00
bergquist	03dae10e79	bus: noop should still execute fn	2018-06-15 12:46:20 +02:00
bergquist	a3ee778ddb	removes unused code	2018-06-15 12:46:20 +02:00
bergquist	9c1758b593	bus: Dispatch now passes empty ctx if handler require it	2018-06-15 12:46:20 +02:00
bergquist	9ca9a7c302	bus: dont start transaction when creating session	2018-06-15 12:46:20 +02:00
bergquist	629eab0b1e	bus: dont mix ctx/classic handlers	2018-06-15 12:46:20 +02:00
bergquist	e2275701d8	bus: DispatchCtx can now invoke any handler	2018-06-15 12:46:20 +02:00
Torkel Ödegaard	5af0b924ff	refactoring: renamed AddCtxHandler to AddHandlerCtx PR #12203	2018-06-15 12:46:20 +02:00
Torkel Ödegaard	442e0e437b	refactoring: transaction manager PR #12203	2018-06-15 12:46:20 +02:00
bergquist	6775a82c82	fixes typo in code	2018-06-15 12:46:20 +02:00
bergquist	1bd31aa313	check if admin exists or create one in one transaction	2018-06-15 12:46:20 +02:00
bergquist	263572813a	replace begin/end with wrapper function	2018-06-15 12:46:20 +02:00
bergquist	8143610024	bus: support multiple dispatch in one transaction ... this makes it possible to run multiple DispatchCtx in one transaction. The TransactionManager will start/end the transaction and pass the dbsession in the context.Context variable	2018-06-15 12:46:20 +02:00
Carl Bergquist	e33d18701d	Merge pull request #12287 from bergquist/fix_12286 ... Influxdb: add mode functions	2018-06-15 12:43:47 +02:00
David Kaltschmidt	d5196ab322	remove internal influx ifql datasource	2018-06-14 20:42:33 +01:00
bergquist	c63533f004	tests: rewrite into table tests	2018-06-14 20:33:36 +02:00
bergquist	bf4ee9bcc6	influxdb: adds mode func to backend ... closes #12286	2018-06-14 20:33:22 +02:00
Marcus Efraimsson	81d34137a8	Merge pull request #11484 from manacker/master ... alerting: fix mobile notifications for microsoft teams notifier	2018-06-14 15:56:18 +02:00
Marcus Efraimsson	284045748c	Merge pull request #12243 from grafana/12236-ds-proxy-tokens ... dsproxy: allow multiple access tokens per datasource	2018-06-14 14:03:08 +02:00
Daniel Lee	10d30f0b73	dsproxy: move http client variable back ... After refactoring to be able to mock the client in a test, the client wasn't a global variable anymore. This change moves the client back to being a package- level variable.	2018-06-14 13:39:46 +02:00
Marcus Efraimsson	2288e01752	Merge pull request #12169 from alexanderzobnin/feat-10796 ... Import dashboard to folder	2018-06-13 13:10:52 +02:00
Alexander Zobnin	25504e84ed	dashboard import to folder: minor fixes	2018-06-13 10:44:37 +03:00
Daniel Lee	719ebdc24d	dsproxy: allow multiple access tokens per datasource ... Changes the cache key for tokens to cache on datasource id + route path + http method instead of just datasource id.	2018-06-12 17:39:38 +02:00
Marcus Efraimsson	3fb4eb7322	Merge pull request #12175 from grafana/davkal/12168-fix-explore-setting ... Respect explore settings in config ini	2018-06-07 12:08:42 +02:00
bergquist	f93d83befe	adds missing return statement	2018-06-06 22:17:19 +02:00
Sławek Piotrowski	9db964bf35	Fix typo: eleasticsearch -> elasticsearch (#12184)	2018-06-06 13:09:16 -07:00
Alexander Zobnin	9460063ab5	show import menu in sidenav, dashboard search and manage dashboards page ... if user has editor permissions for at least one folder	2018-06-06 13:55:00 +03:00
David Kaltschmidt	661503f828	Respect explore settings in config ini ... Previous explore restrictions only took permissions into consideration. * add `exploreEnabled` to global settings * only bind `x` if enabled * only show explore in panel menu if enabled	2018-06-06 10:50:47 +02:00
Alexander Zobnin	4063ae37a4	dashboard: import to folder	2018-06-05 19:23:09 +03:00
David	45a156577c	Merge pull request #12143 from grafana/davkal/ifql-datasource ... InfluxDB IFQL datasource (beta)	2018-06-05 14:23:21 +02:00
Marcus Efraimsson	962f996799	always show server admin link in sidenav if grafana admin	2018-06-04 19:28:01 +02:00
pari-	9680a3d44d	Gravatar fallback does not respect 'AppSubUrl'-setting (#12149) ... Closes #12148	2018-06-04 16:03:59 +02:00
David	b5c53aae97	Merge pull request #12108 from grafana/davkal/12001-explore-permissions ... Restrict Explore UI to Editor and Admin roles	2018-06-04 16:01:39 +02:00
Carl Bergquist	7214ee9024	Merge pull request #12007 from bergquist/provisioning_symlinked_folders ... Add support for symlinked folders in dashboard provisioning	2018-06-04 16:00:32 +02:00
bergquist	cd4026da6b	Revert "provisioning: turn relative symlinked path into absolut paths" ... This reverts commit d089b5e05d.	2018-06-04 15:38:37 +02:00
bergquist	d089b5e05d	provisioning: turn relative symlinked path into absolut paths	2018-06-04 15:20:26 +02:00
Marcus Efraimsson	38906acda9	elasticsearch: sort bucket keys to fix issue wth response parser tests	2018-06-04 15:15:47 +02:00
Carl Bergquist	49d9235433	Merge pull request #12122 from grafana/provisioning_ha ... Support provisioning in HA setup where modtime differs	2018-06-04 15:12:46 +02:00
David Kaltschmidt	08ee1da6b1	InfluxDB IFQL datasource	2018-06-04 12:24:47 +02:00
Alexander Zobnin	13c6f37ea5	alerting: show alerts for user with Viewer role ... changelog: add notes about closing #11167 remove changelog note reformat alert_test.go	2018-06-04 12:34:30 +03:00
bergquist	f606654c50	provisioning: adds fallback if evalsymlink/abs fails	2018-06-04 09:04:33 +02:00
bergquist	3f5078339c	tests: uses different paths depending on os	2018-06-04 08:27:03 +02:00
bergquist	75ee1e9208	renames intervalSeconds to updateIntervalSeconds	2018-06-04 08:13:20 +02:00
Marcus Efraimsson	b6afe5f2e8	Merge pull request #11380 from WPH95/feature/add_es_alerting ... elasticsearch: alerting support	2018-06-01 15:17:28 +02:00
Patrick O'Carroll	0c269d64d0	Alert panel filters (#11712) ... alert list panel: filter alerts by name, dashboard, folder, tags	2018-06-01 14:36:40 +02:00
bergquist	333af6fd9b	provisioning: makes the interval for polling for changes configurable	2018-05-31 21:07:34 +02:00
bergquist	c817aecd66	provisioning: only update dashboard if hash of json changed	2018-05-31 21:05:52 +02:00
Marcus Efraimsson	b8ff3b1e3f	remove dead code	2018-05-31 19:05:32 +02:00