15136 Commits (d06b26de262c1dccb9976d506fdc8e6f39b16118)

 

All Branches   

Search

Author	SHA1	Message	Date
Tobias Skarhed	12e76ad197	Remove logs and comments	7 years ago
Tobias Skarhed	bd417bedb2	Start elastic ds test conversion	7 years ago
Marcus Efraimsson	a8970a4de9	run enterprise build only on master for now	7 years ago
Augustin Husson	86a574cc50	refix the settings indentation	7 years ago
Augustin Husson	991a4b1663	update stats admin doc	7 years ago
Augustin Husson	01fc6c5d95	fix json indentation	7 years ago
Marcus Efraimsson	d2f31a716f	remove unnecessary conversions	7 years ago
Marcus Efraimsson	723a894fc5	changelog: update ... [skip ci]	7 years ago
Marcus Efraimsson	634c77469d	changelog: add notes about closing #11818 ... [skip ci]	7 years ago
Marcus Efraimsson	faf2ab4249	changelog: add notes about closing #12460 ... [skip ci]	7 years ago
Marcus Efraimsson	512e7f8567	changelog: add notes about closing #8186 ... [skip ci]	7 years ago
Marcus Efraimsson	60792d57dd	changelog: add notes about closing #12379 ... [skip ci]	7 years ago
Marcus Efraimsson	27aa1cd568	changelog: add notes about closing #12362 ... [skip ci]	7 years ago
Torkel Ödegaard	1f97df46c1	devenv: open ldap docker block now prepopulating data with correct member groups	7 years ago
Leonard Gram	1586a42a71	ci: Only publish grafana enterprise packages tagged with enterprise.	7 years ago
Martin Packman	6046c8b4ca	Make table sorting stable when null values exist (#12362) ... Currently if a null appears in a table column, for instance in data returned by postgres, sorting on that gives an arbitrary order. This is due to null being neither greater or less than any string, which makes the sort unstable. Change the table sort function to compare on nullness first. Note this is a slight behaviour change for numbers, which would otherwise treat null and 0 as equivalent. Signed-off-by: Martin Packman <gzlist@googlemail.com>	7 years ago
David	0d1f7c8782	Fix bar width issue in aligned prometheus queries (#12483) ... * Fix bar width issue in aligned prometheus queries This was broken because null values were filled in with unaligned times. * use aligned times for result transformation * add tests An earlier version of this fix aligned the times again in the transformer, but I think it's safe to only deal with aligned times in the response. * Fixed prometheus heatmap tranformer test The interval needs to be 1 to prevent step alignment.	7 years ago
zicklam	a89351e8e0	correct example (#12481) ... foo.bar.com in description, but foo.bar in configuration. Updated description, makes more sense then changing the configuration :)	7 years ago
Torkel Ödegaard	37efa934f1	ldap: improved ldap test env with more structured users and groups	7 years ago
Leonard Gram	5e08bf5130	test: fixed usage of wrap in tests.	7 years ago
Leonard Gram	4245f0ce11	ci: typo	7 years ago
Leonard Gram	8d6797c367	ci: publishes grafana enterprise to s3.	7 years ago
Torkel Ödegaard	6286c31d4b	refactoring: making api wrap public	7 years ago
Torkel Ödegaard	b8724ae0c4	refactoring: enterprise build/hooks refactorings (#12478)	7 years ago
Tobias Skarhed	2941dff428	Karma to Jest: datasource_srv (#12456) ... * Karma to Jest: datasource_srv * Sort function differs between Karma and Jest * Fix error based on .sort() implementation * Remove Karma test * alerting: only log when screenshot been uploaded * Remove comments * Karma to Jest: datasource_srv * Sort function differs between Karma and Jest * Fix error based on .sort() implementation * Remove Karma test * Remove comments * Remove console.log * Remove console.log * Change sorting and add test for default data source	7 years ago
Torkel Ödegaard	10e86eda69	fix: #12461 introduced issues with route registration ordering, adding plugin static routes before plugins package had been initiated (#12474)	7 years ago
Mitsuhiro Tanda	aa1b5959da	omit extra template refresh (#12454)	7 years ago
Carl Bergquist	861af4cb97	Improve extensions build. (#12461) ... * enable ee build on pr/master * step1: of including group sync * disable commit pinning for now * fixes broken build * enable team to ldap group sync * avoid returning error for missing external handler * services: allow routes to be added before http server start * services: allows services to add their own migrations * moves db migrations to ee code base * build using master branch in ee * disable enterprise build in .bra.toml [skip ci] * removes team sync extensions * removes commented line	7 years ago
Sven Klemm	1601f6d17c	[mysql] fix $__timeGroup rounding (#12469) ... * fix $__timeGroup rounding for mysql * revert accidentally commented out line	7 years ago
Sven Klemm	f017c04a65	[mssql] fix $__timeGroup rounding (#12470) ... * fix $__timeGroup rounding for mssql * revert enabling of mssql integration tests	7 years ago
Sven Klemm	c2c22c142b	[postgres] fix timeGroup macro rounding (#12468) ... * fix timeGroup tests to check for correct grouping * do explicit floor rounding in $__timeGroup macro * fix typo in comments	7 years ago
Will Weber	c03d527d25	pkg/social/github: Allow changing of userinfo data (#12471) ... Experienced a problem where a user whose email changed was no longer able to login. By using the ID as a primary identifier, we can avoid conflicts of this variety within the github OAuth provider.	7 years ago
Carl Bergquist	88783d6e0a	avoid calling os.Exit outside main.go (#12459) ... I don't think we should call os.Exit outside main.go. Calling os.Exit breaks the application control flow.	7 years ago
Marcus Efraimsson	845724e8b9	update mysql/mssql query/annotation help sections	7 years ago
Marcus Efraimsson	7a4858dd11	docs: update folders api	7 years ago
Austin Winstanley	59675dc564	Changed documentation for MSSQL and MySQL to reflect macro changes	7 years ago
Marcus Efraimsson	2835acf48c	docs: update scripted dashboard for v5	7 years ago
Marcus Efraimsson	4530925b9f	docs: update scripted dashboard for v5	7 years ago
Marcus Efraimsson	cdaeb1578d	docs: update organisation http api ... make the distinction clearer between /api/org and /api/orgs and that basic auth must be used for the /api/orgs resource	7 years ago
Marcus Efraimsson	aae3b568f3	docs: upd windows installation	7 years ago
bergquist	d440b9a8d1	registry: adds more comments	7 years ago
bergquist	f0f6d0e915	registry: adds comments to interfaces	7 years ago
Marcus Efraimsson	cb706bd059	changelog: update ... [skip ci]	7 years ago
Marcus Efraimsson	32793350b8	changelog: update ... [skip ci]	7 years ago
Marcus Efraimsson	0dd0b65900	changelog: add notes about closing #12438 ... [skip ci]	7 years ago
Marcus Efraimsson	59756863df	Merge pull request #12439 from grafana/fix-log-close-too-early ... Fix: Log close (ie flush) was done too early, before final shutdown log	7 years ago
bergquist	c4292b43f5	alerting: only log when screenshot been uploaded	7 years ago
bergquist	ce88e4b927	fixes typos ... closes #12453	7 years ago
Austin Winstanley	9823da1cc5	Reverted yarn.lock to master	7 years ago
Austin Winstanley	afee29be68	Merge branch 'master' into macros/sql	7 years ago