IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-25 18:30:41 -06:00
Code Issues Packages Projects Releases Wiki Activity
15,050 Commits 5,085 Branches 538 Tags 1.9 GiB
37efa934f1
Commit Graph

15050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard
37efa934f1 ldap: improved ldap test env with more structured users and groups 2018-07-02 17:27:16 +02:00
Leonard Gram
5e08bf5130 test: fixed usage of wrap in tests. 2018-07-02 17:13:59 +02:00
Leonard Gram
4245f0ce11 ci: typo 2018-07-02 16:10:20 +02:00
Leonard Gram
8d6797c367 ci: publishes grafana enterprise to s3. 2018-07-02 16:05:23 +02:00
Torkel Ödegaard
6286c31d4b refactoring: making api wrap public 2018-07-02 14:13:18 +02:00
Torkel Ödegaard
b8724ae0c4
refactoring: enterprise build/hooks refactorings (#12478) 2018-07-02 04:33:39 -07:00
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
 2018-07-02 04:18:23 -07:00
Torkel Ödegaard
10e86eda69
fix: #12461 introduced issues with route registration ordering, adding plugin static routes before plugins package had been initiated (#12474) 2018-07-01 23:35:50 -07:00
Mitsuhiro Tanda
aa1b5959da omit extra template refresh (#12454) 2018-07-01 22:56:24 -07:00
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
 2018-07-01 07:01:43 -07:00
Sven Klemm
1601f6d17c [mysql] fix $__timeGroup rounding (#12469) 
* fix $__timeGroup rounding for mysql

* revert accidentally commented out line
 2018-07-01 06:59:05 -07:00
Sven Klemm
f017c04a65 [mssql] fix $__timeGroup rounding (#12470) 
* fix $__timeGroup rounding for mssql

* revert enabling of mssql integration tests
 2018-07-01 06:57:02 -07:00
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
 2018-07-01 06:55:46 -07:00
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.
 2018-07-01 05:56:16 -07:00
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.
 2018-06-29 22:48:26 -07:00
Marcus Efraimsson
7a4858dd11
docs: update folders api 2018-06-29 20:24:02 +02:00
Marcus Efraimsson
2835acf48c
docs: update scripted dashboard for v5 2018-06-29 19:36:15 +02:00
Marcus Efraimsson
4530925b9f
docs: update scripted dashboard for v5 2018-06-29 19:30:29 +02:00
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
 2018-06-29 19:10:42 +02:00
Marcus Efraimsson
aae3b568f3
docs: upd windows installation 2018-06-29 18:21:56 +02:00
bergquist
d440b9a8d1 registry: adds more comments 2018-06-29 11:58:54 +02:00
bergquist
f0f6d0e915 registry: adds comments to interfaces 2018-06-29 11:45:32 +02:00
Marcus Efraimsson
cb706bd059
changelog: update 
[skip ci]
 2018-06-29 10:52:42 +02:00
Marcus Efraimsson
32793350b8
changelog: update 
[skip ci]
 2018-06-29 10:49:36 +02:00
Marcus Efraimsson
0dd0b65900
changelog: add notes about closing #12438 
[skip ci]
 2018-06-29 10:48:50 +02:00
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
 2018-06-29 10:45:14 +02:00
bergquist
c4292b43f5 alerting: only log when screenshot been uploaded 2018-06-29 09:58:58 +02:00
bergquist
ce88e4b927 fixes typos 
closes #12453
 2018-06-29 09:35:31 +02:00
Marcus Efraimsson
fb2b2c9f65
changelog: add notes about closing #12444 
[skip ci]
 2018-06-28 16:39:38 +02:00
Marcus Efraimsson
d226383c4e
Merge pull request #12444 from grafana/revert-12299-10707_whitelist 
Revert "auth proxy: use real ip when validating white listed ip's"
 2018-06-28 16:31:26 +02:00
Marcus Efraimsson
8af5da7383
Revert "auth proxy: use real ip when validating white listed ip's" 2018-06-28 15:43:33 +02:00
Daniel Lee
7a2be69abc changelog: adds note for #11892 2018-06-28 14:46:40 +02:00
Daniel Lee
8537f10285
Merge pull request #11892 from ApsOps/colorize-singlestat-prefix-postfix-option 
Make colorization of prefix and postfix optional in singlestat
 2018-06-28 14:42:48 +02:00
Marcus Efraimsson
4c4bd2ebba
changelog: add notes about closing #12430 
[skip ci]
 2018-06-28 14:27:41 +02:00
Marcus Efraimsson
ab458061e6
Merge pull request #12441 from grafana/12430_fix 
Fix footer CSS issue
 2018-06-28 14:25:08 +02:00
Marcus Efraimsson
54420363d3
fix footer css issue 2018-06-28 14:02:42 +02:00
Tobias Skarhed
af0a4a6039 Karma to Jest: 3 test files (#12414) 
* Karma to Jest: viewstate_srv

* Karma to Jest: annotations_srv

* Remove comments

* Karma to Jest: series_override_ctrl

* Remove unnecessary code

* Class to function and fix lint error

* Fix ngInject
 2018-06-28 04:43:23 -07:00
Torkel Ödegaard
7a7c6f8fab fix: log close/flush was done too early, before server shutdown log message was called, fixes #12438 2018-06-28 04:38:23 -07:00
Tobias Skarhed
443ff5deb4 Karma to Jest: value_select_dropdown (#12435) 
* Begin Karma 2 Jest: value_select_dropdown

* Add return for Promise

* Remove Karma test
 2018-06-28 03:10:36 -07:00
Dan Cech
3056d9a80e support passing api token in Basic auth password (#12416) 2018-06-28 03:08:32 -07:00
Tobias Skarhed
c2381f088f Add disabled styles for checked checkbox (#12422) 2018-06-28 03:02:49 -07:00
Marcus Efraimsson
3cf6a1a94b
changelog: add notes about closing #11920 
[skip ci]
 2018-06-27 15:17:15 +02:00
Marcus Efraimsson
18032b374b
changelog: add notes about closing #11920 
[skip ci]
 2018-06-27 15:11:44 +02:00
Marcus Efraimsson
f1ab1a26e9
changelog: update 
[skip ci]
 2018-06-27 14:48:55 +02:00
Marcus Efraimsson
6fa87e6278
docs: upd what's new in v5.2 2018-06-27 14:20:36 +02:00
Marcus Efraimsson
b011444246
release 5.2.0 2018-06-27 11:39:04 +02:00
Marcus Efraimsson
e378f6db88
docs: update index with link to what's new in 5.2 instead of 5.0 2018-06-27 11:35:53 +02:00
Marcus Efraimsson
ec3a4e105f
changelog: add notes about closing #12385 
[skip ci]
 2018-06-26 18:11:56 +02:00
Marcus Efraimsson
06daae2179
Merge pull request #12412 from grafana/12393_login 
login: fix layout issues
 2018-06-26 18:01:54 +02:00
Marcus Efraimsson
8d535dd90d
docs: upd what's new in v5.2 
[skip ci]
 2018-06-26 15:42:34 +02:00