14985 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Carl Bergquist	1165d098b0	Merge pull request #12407 from pengwk/patch-1 ... Fix typo	2018-06-26 08:30:05 +02:00
peng weikang	e4669681c4	Fix typo	2018-06-26 14:04:54 +08:00
Carl Bergquist	175e95abb0	Merge pull request #12396 from bergquist/routing ... routing: allows routes to be added to existing groups	2018-06-25 17:17:14 +02:00
bergquist	4a46dd886b	routing: raise panic if duplicate routes are added	2018-06-25 16:58:49 +02:00
bergquist	dbfafa1cb5	routing: allows routes to be added to existing groups ... this enables services to add routing to ex /api without causing conflicts.	2018-06-25 16:50:27 +02:00
Marcus Efraimsson	c23f9a1f37	changelog: add notes about closing #11868 ... [skip ci]	2018-06-25 16:32:32 +02:00
Marcus Efraimsson	2b3bfd2f65	Merge pull request #12198 from grafana/11868_missing_phantom ... enhance error message if phantomjs executable is not found	2018-06-25 16:27:12 +02:00
Marcus Efraimsson	f106de0efd	enhance error message if phantomjs executable is not found ... if arm build, explain that phantomjs is not included by default in arm builds. If not explain that phantom js isn't installed correctly	2018-06-25 16:06:52 +02:00
Torkel Ödegaard	132df4553c	fix: annnotation api & sql issue	2018-06-25 16:03:38 +02:00
Marcus Efraimsson	ed1fec8e0f	changelog: add notes about closing #12248 ... [skip ci]	2018-06-25 15:24:12 +02:00
Marcus Efraimsson	98a7f258af	Merge pull request #12392 from dehrax/12248-fix ... Fix selecting current dashboard from search does not reload dashboard	2018-06-25 15:21:24 +02:00
Augustin	eb4d860fcb	Light improve of massive delete annotation api (#12390) ... * fix delete annotations * fix self assignment * add right unit test using admin role	2018-06-25 04:58:49 -07:00
Tobias Skarhed	762ee203fa	Fix 12248	2018-06-25 13:46:33 +02:00
PedroD	3bf12e4ff5	Fixing wrong /public path, relative to the webpack.dev script, that would avoid webpack from cleaning previous builds. (#12351)	2018-06-25 04:45:47 -07:00
Marcus Efraimsson	7797a66b58	changelog: add notes about closing #12383 ... [skip ci]	2018-06-25 13:17:33 +02:00
Marcus Efraimsson	1726f6358f	Merge pull request #12383 from CorpGlory/master ... Set $rootScope in DatasourceSrv	2018-06-25 11:14:55 +02:00
bergquist	e0ac31a28a	changelog: adds note about closing #12313	2018-06-25 08:02:51 +02:00
Carl Bergquist	15bbe81fed	Merge pull request #12387 from AustinWinstanley/master ... Return a 404 when deleting a datasource through the API if it doesn't…	2018-06-25 07:49:18 +02:00
Austin Winstanley	defb0396b7	Return a 404 when deleting a datasource through the API if it doesn't exist and add a test for it to confirm #12313	2018-06-22 21:15:36 -05:00
rozetko	97db9ece98	Set $rootScope in DatasourceSrv	2018-06-22 16:17:02 +03:00
Daniel Lee	b2187b70a7	Merge pull request #11990 from mtanda/issue_11925 ... fix "Cloudwatch panel does not allow arbitrary variable values in query"	2018-06-21 18:00:49 +02:00
bergquist	eaf5b1c1cf	devenv: adds dashboard with multiple rows	2018-06-21 16:31:10 +02:00
Daniel Lee	75e378b689	Merge pull request #12367 from dehrax/12224-history-ctrl ... Karma to Jest: history_ctrl	2018-06-21 14:52:01 +02:00
bergquist	4b8b4e171a	changelog: adds note about closing #10971	2018-06-21 14:31:55 +02:00
Carl Bergquist	828fb39ee2	Merge pull request #11643 from mrsiano/generic_oauth ... Pass configured/auth headers to a Datasource.	2018-06-21 14:21:59 +02:00
mrsiano	cc1e3a0e3c	Pass configured/auth headers to a Datasource. ... In some setups (ex openshift), the Datasource will require Grafana to pass oauth token as header when sending queries. Also, this PR allow to send any header which is something Grafana currently does not support.	2018-06-21 14:58:05 +03:00
Daniel Lee	6871f4c14e	Merge pull request #12018 from forzafootball/am/fix-query-variable-influxdb ... Conditionally select a field to return in ResponseParser for InfluxDB	2018-06-21 12:25:15 +02:00
Tobias Skarhed	4c31173853	Karma to Jest: history_ctrl. .gitingore: .vs/	2018-06-21 11:54:47 +02:00
Carl Bergquist	e17944db15	Merge pull request #12325 from albundy83/patch-1 ... Fix error in InfluxDB query	2018-06-21 10:57:26 +02:00
Marcus Efraimsson	8ba869ac72	changelog: add notes about closing #12359 ... [skip ci]	2018-06-21 10:50:28 +02:00
Marcus Efraimsson	45610ecd89	Merge pull request #12363 from grafana/12359_sign_rpm_packages ... build: fix signing of multiple rpm packages	2018-06-21 10:45:09 +02:00
Marcus Efraimsson	e617e23927	build: fix signing of multiple rpm packages	2018-06-21 10:27:59 +02:00
Marcus Efraimsson	8b5d78a63e	docs: what's new in v5.2 and docker installation updates ... [skip ci]	2018-06-20 18:53:17 +02:00
bergquist	503c8cd8ef	tech: adds comments about route register code	2018-06-20 16:55:42 +02:00
Marcus Efraimsson	cce9632837	changelog: add notes about closing issue ... https://github.com/grafana/grafana-docker/issues/170 [skip ci]	2018-06-20 15:38:13 +02:00
Tobias Skarhed	d00e2c20cf	Karma to Jest: history_ctrl. Update version: ts-jest	2018-06-20 15:25:57 +02:00
Marcus Efraimsson	5a5601a8d2	changelog: add notes about 5.2.0-beta2 ... [skip ci]	2018-06-20 13:56:24 +02:00
Marcus Efraimsson	76df428ea2	changelog: add notes about closing #12240 ... [skip ci]	2018-06-20 13:54:57 +02:00
Marcus Efraimsson	3199287ce0	changelog: add notes about closing #12256 ... [skip ci]	2018-06-20 13:20:03 +02:00
Marcus Efraimsson	051ddb245d	Merge pull request #12346 from grafana/12256_export ... Make sure to process panels in collapsed rows when exporting dashboard	2018-06-20 13:17:32 +02:00
Marcus Efraimsson	9532cfee5f	changelog: add notes about closing #11792 ... [skip ci]	2018-06-20 13:16:23 +02:00
Marcus Efraimsson	296a841685	Merge pull request #12123 from alexanderzobnin/fix-11792 ... graph: fix legend decimals precision calculation	2018-06-20 13:08:17 +02:00
Marcus Efraimsson	ae07fc29e2	changelog: add notes about closing #12315 ... [skip ci]	2018-06-20 13:04:39 +02:00
Marcus Efraimsson	2cbec532ee	Merge pull request #12345 from grafana/12315_dash_links ... Fix dashboard drop down links	2018-06-20 13:00:17 +02:00
Marcus Efraimsson	4ef4a4d3a7	dashboard: fix drop down links	2018-06-20 12:41:11 +02:00
Daniel Lee	a795715d2f	Merge pull request #12350 from grafana/12240_save_modal_regression ... Fix regressions after save modal changes	2018-06-20 10:40:49 +02:00
Carl Bergquist	578a8e8f55	Merge pull request #12322 from bergquist/sqlstore_refactoring ... expose session and transaction helpers to other services	2018-06-20 10:22:06 +02:00
Marcus Efraimsson	41ac8d4cd5	fix regressions after save modal changes of not storing time and variables per default ... Fix problem with adhoc variable filters not handled. Fix problem with saving variables and time per default when saving a dashboard as/first time. Fix updating dashboard model after save with saving time/variables enabled so that next time you save you won't get checkboxes for save time/variables unless any values changed. Tests validating correctness if time/variable values has changed.	2018-06-20 09:52:29 +02:00
Tobias Skarhed	3a9a36d6cf	Karma to Jest: history_srv (#12341) ... * Karma to Jest: history_srv * Fix TS errors * Remove q, as it is not needed	2018-06-19 08:05:49 -07:00
Marcus Efraimsson	a2e08dc4e8	make sure to process panels in collapsed rows when exporting dashboard	2018-06-19 16:56:14 +02:00