15135 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marcus Efraimsson	5377ad4e96	remove unused argument in default scenario of guardian test	2018-06-19 12:34:34 +02:00
Torkel Ödegaard	24d0b43e62	fix: fixed permission issue with api key with viewer role in dashboards with default permissions	2018-06-19 11:10:17 +02:00
Tobias Skarhed	8666c77cc9	Karma to Jest: time_srv (#12303) ... * Begin Karma to Jest: time_srv * Remove experimental fix * location search stubs for each test * Fix issue where time service was not available for other tests	2018-06-18 09:47:23 -07:00
Tobias Skarhed	5bf72fc9f4	Karma to Jest: team_details_ctrl (#12321)	2018-06-18 07:54:56 -07:00
Grégoire Bellon-Gervais	7b3652af67	Fix error in InfluxDB query ... Minor error in sql query to retrieve annotations	2018-06-18 16:10:40 +02:00
bergquist	3479cf4b39	expose functions to use sessions	2018-06-18 14:50:36 +02:00
bergquist	2b849086a1	changelog: adds note about closing #11607 ... [skip ci]	2018-06-18 13:51:20 +02:00
Carl Bergquist	764a4247f5	Merge pull request #12274 from xapon/11607-cleanup ... #11607 Cleanup time of temporary files is now configurable	2018-06-18 13:50:05 +02:00
bergquist	dd7a185a91	test commit for checking github permissions ... [skip ci]	2018-06-18 11:41:28 +02:00
Marcus Efraimsson	9a4ccdf388	changelog: add notes about closing #12278 ... [skip ci]	2018-06-18 11:28:33 +02:00
Marcus Efraimsson	9271e48513	Merge pull request #12317 from grafana/12278_snapshot_annotations ... Copy correct annotation props when creating a snapshot	2018-06-18 11:24:04 +02:00
Marcus Efraimsson	b72c45f735	changelog: add notes about closing #11076 ... [skip ci]	2018-06-18 11:22:55 +02:00
Marcus Efraimsson	004142a1e4	Merge pull request #12263 from grafana/11076_current_org ... Set current org when adding/removing user to org	2018-06-18 11:19:42 +02:00
Marcus Efraimsson	a738347957	snapshot: copy correct props when creating a snapshot	2018-06-18 11:04:16 +02:00
Carl Bergquist	d6f4313c2f	Merge pull request #12203 from bergquist/bus_multi_dispatch ... bus: support multiple dispatch in one transaction	2018-06-18 10:54:05 +02:00
Marcus Efraimsson	6d48d0a80c	set current org when adding/removing user to org ... To not get into a situation where a user has a current organization assign which he is not a member of we try to always make sure that a user has a valid current organization assigned.	2018-06-18 09:30:01 +02:00
Marcus Efraimsson	ab9f0e8edd	changelog: add notes about closing #10707 ... [skip ci]	2018-06-18 09:03:30 +02:00
Marcus Efraimsson	18167f1c18	Merge pull request #12299 from grafana/10707_whitelist ... auth proxy: whitelist proxy ip instead of client ip	2018-06-18 09:00:41 +02:00
Tim Heckman	a2ff7629e0	Include the vendor directory when copying source in to Docker (#12305) ... This change updates the `.dockerignore` file to no longer contain the `vendor/` directory. When a Go project provides a `vendor/` directory within the repository, the best practice is to build that project using their vendored dependencies. By putting it in the `.dockerignore` file we prevent consumers from easily doing that. The `vendor/` directory is used to include all of the dependencies needed to build a project. This makes it so that we can reproducibly build the project, at any given commit, because the dependencies will always be present. Also, using the vendor directory avoids us needing to continually re-download all the dependencies, and it protects us from build failures if GitHub is down or a dependency gets removed or renamed. In addition to the change above, this also removes an extra `/tmp` entry from the `.dockerignore` file. Fixes #12304 Signed-off-by: Tim Heckman <t@heckman.io>	2018-06-17 22:38:37 -07:00
bergquist	6782be80fd	changelog: adds note about closing #12199	2018-06-16 16:59:15 +02:00
Carl Bergquist	e2adb4ced5	Merge pull request #12302 from grafana/12199_cloudwatch_panic ... cloudwatch: handle invalid time range	2018-06-16 16:57:23 +02:00
bergquist	4c5fe68e7e	adds inTransactionCtx that calls inTransactionWithRetryCtx	2018-06-15 21:57:13 +02:00
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
Marcus Efraimsson	c02dd7462a	cloudwatch: handle invalid time range	2018-06-15 15:48:25 +02:00
Marcus Efraimsson	b418e14bd9	make sure to use real ip when validating white listed ip's	2018-06-15 15:29:43 +02:00
bergquist	4be6ef4ab3	changelog: adds note about closing #12286	2018-06-15 12:47:53 +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
Marcus Efraimsson	f0254c201a	Merge pull request #12215 from ryantxu/use-ng-if-for-time ... use ng-if for the panel timeInfo	2018-06-15 12:16:48 +02:00
Marcus Efraimsson	a02306bc75	Merge pull request #12295 from bergquist/docker_master ... docs: adds info about grafana-dev container	2018-06-15 11:32:24 +02:00
bergquist	10d840b1cc	docs: adds info about grafana-dev container	2018-06-15 11:07:23 +02:00
Marcus Efraimsson	551957fc4d	changelog: add notes about closing #12282 ... [skip ci]	2018-06-15 10:57:19 +02:00
flopp999	2d1f59a9cc	Added Litre/min and milliLitre/min in Flow (#12282) ... units: Litre/min and milliLitre/min in Flow	2018-06-15 10:54:38 +02:00
Marcus Efraimsson	5f78ad583f	remove papaparse dependency	2018-06-15 10:49:57 +02:00
Marcus Efraimsson	22c7c741eb	Merge pull request #12252 from grafana/davkal/ifql-query ... Internal Influx Flux plugin cleanup	2018-06-15 10:43:34 +02:00
Marcus Efraimsson	b62322b128	Merge pull request #12288 from mlclmj/master ... docs: HTTP Endpoint for Deleting an Organization	2018-06-15 10:37:51 +02:00
Marcus Efraimsson	96287a9061	Merge pull request #12294 from vincent-fuchs/patch-1 ... docs: delete_datasources -> deleteDatasources in provisioning	2018-06-15 10:33:03 +02:00