public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,865 Commits 655 Branches 650 Tags
b94de101cd95b23f0266cd61e311f09ae8ad7592
Commit Graph
4385 Commits
Author SHA1 Message Date
Torkel Ödegaard b3531362ca fix: minor fix to plugin service shut down flow 2018-04-27 21:22:29 +02:00
bergquist c902ec1808 Merge branch 'notification-service-refactor2' 
* notification-service-refactor2:
  fix: removed log calls used while troubleshooting
  refactor: refactoring notification service to use new service registry hooks
 2018-04-27 16:59:32 +02:00
Carl Bergquist 2cc855a131 Merge branch 'master' into notification-service-refactor2 2018-04-27 16:59:14 +02:00
David d8abfe6a7d Merge pull request #11742 from grafana/davkal/explore 
Explore UI skeleton
 2018-04-27 15:46:40 +02:00
David Kaltschmidt 25d3ec5bbf Fixed settings default and explore path 2018-04-27 15:35:46 +02:00
Torkel Ödegaard a8eed9d344 Refactoring PluginManager to be a self registering service (#11755) 
* refator: refactored PluginManager to be a self registering service, a lot more work needed to fully make plugin manager use instance variables and not so many globals
 2018-04-27 15:11:55 +02:00
Torkel Ödegaard 44b0f15a61 fix: removed log calls used while troubleshooting 2018-04-27 14:28:42 +02:00
Torkel Ödegaard df71fe33fd refactor: refactoring notification service to use new service registry hooks 2018-04-27 14:15:17 +02:00
Carl Bergquist 28f7b6dad1 Enable Grafana extensions at build time. (#11752) 
* extensions: import and build

* bus: use predefined error

* enterprise: build script for enterprise packages

* poc: auto registering services and dependency injection

(cherry picked from commit b5b1ef875f905473af41e49f8071cb9028edc845)

* poc: backend services registry progress

(cherry picked from commit 97be69725881241bfbf1e7adf0e66801d6b0af3d)

* poc: minor update

(cherry picked from commit 03d7a6888b81403f458b94305792e075568f0794)

* ioc: introduce manuel ioc

* enterprise: adds setting for enterprise

* build: test and build specific ee commit

* cleanup: test testing code

* removes example hello service
 2018-04-27 13:41:58 +02:00
David Kaltschmidt 1e6e89121c Settings to enable Explore UI 2018-04-27 11:39:14 +02:00
David Kaltschmidt f1220fd2a4 Explore WIP 2018-04-26 20:27:19 +02:00
Mario Trangoni 97fd66db2e pkg: fix deadcode issues 2018-04-26 19:24:21 +02:00
Marcus Efraimsson 1452634a2a mssql: fix value columns conversion to float when using timeseries query 2018-04-24 19:54:08 +02:00
Marcus Efraimsson cf43007531 postgres: fix value columns conversion to float when using timeseries query 2018-04-24 19:53:36 +02:00
Marcus Efraimsson 346577b664 mysql: fix value columns conversion to float when using timeseries query 2018-04-24 19:53:06 +02:00
Marcus Efraimsson 76bd2aea44 sql datasource: extract common logic for converting value column to float 2018-04-24 19:50:14 +02:00
Mario Trangoni b02a860e66 pkg/components: fix ineffassign issues 2018-04-23 20:03:57 +02:00
Mario Trangoni 15f11effa0 pkg/cmd: fix ineffassign issues 2018-04-23 19:34:55 +02:00
Mario Trangoni bc570bb140 pkg/log: fix ineffassign issues 2018-04-23 19:31:23 +02:00
Mario Trangoni 6eb00000fe pkg/services: fix ineffassign issues 2018-04-23 19:28:54 +02:00
Dan Cech affd3d15a0 Merge pull request #11150 from sbskas/master 
Make Ldap group composed of  DNs work.
 2018-04-23 10:49:45 -04:00
Marcus Efraimsson d14ac54af6 db: fix failing user auth tests for postgres 2018-04-23 16:02:59 +02:00
Marcus Efraimsson d86ed679b1 return inherited property for permissions 2018-04-23 09:23:14 +02:00
Mario Trangoni 556219b192 pkg/tsdb: fix ineffassign isues 2018-04-22 20:51:58 +02:00
Jonathan McCall 069012639a Sort results from GetDashboardTags 2018-04-20 12:17:17 -04:00
Daniel Lee 3451f9a9db Merge branch 'annotations-created' of https://github.com/ryantxu/grafana into ryantxu-annotations-created 2018-04-20 17:14:06 +02:00
bergquist 03a9650c57 cli: adds os and arch headers 
this makes it possible for the plugin repo
to provide the correct package if arch and os matters
 2018-04-20 09:52:25 +02:00
Dan Cech 7cc3d0c34e Merge branch 'master' into master 2018-04-19 12:01:48 -04:00
Mario Trangoni 33ae8d35ea comment unused struct fields 2018-04-18 22:23:49 +02:00
Mario Trangoni c1742df9ac remove unused variables detected by varcheck 2018-04-18 19:04:37 +02:00
bergquist dbf61355b3 style: code simplifications 2018-04-18 12:16:25 +02:00
bergquist c22495b6f8 Merge branch 'master' into external-auth 
* master:
  changelog: adds note about closing #11613 and #11602
  fix: sign in link should have target self to trigger full page reload, fixes #11626
  codespell: exclude by words instead of files
  Use sort.Strings() (gosimple)
  Remove unused return value assignment (gosimple)
  Remove unnecessary fmt.Sprintf() calls (gosimple)
  Merge variable declaration with assignment (gosimple)
  Use fmt.Errorf() (gosimple)
  Simplify make() (gosimple)
  Use raw strings to avoid double escapes (gosimple)
  Simplify if expression (gosimple)
  Simplify comparison to bool constant (gosimple)
  Simplify error returns (gosimple)
  Remove redundant break statements (gosimple)
 2018-04-18 09:34:45 +02:00
Dan Cech 3fedcb1e4b cleanup, make sure users are always synced with ldap 2018-04-17 17:48:56 -04:00
Dan Cech 33760b5c3b make sure user's default org is kept up to date 2018-04-17 16:51:05 -04:00
Carl Bergquist 8367199a2d Merge pull request #11613 from knweiss/gosimple 
Code simplification (gosimple)
 2018-04-17 22:40:40 +02:00
Dan Cech 00e74990ed remove old comment 2018-04-17 14:06:25 -04:00
Dan Cech 857830d981 org role sync tests 2018-04-17 14:06:25 -04:00
Dan Cech 52503d9cb5 refactor authproxy & ldap integration, address comments 2018-04-17 14:06:25 -04:00
Dan Cech c8a0c1e6b8 pass DN in ldap test 2018-04-17 14:06:25 -04:00
Dan Cech daeba40b3b tests for user auth module 2018-04-17 14:06:25 -04:00
Dan Cech 59f83ca5d8 fix ldap test 2018-04-17 14:06:25 -04:00
Dan Cech e53e039b1b restructure GetUserByAuthInfo 2018-04-17 14:06:25 -04:00
Dan Cech c4168c2396 error handling 2018-04-17 14:06:25 -04:00
Dan Cech 65847da1df use Result in GetAuthInfoQuery 2018-04-17 14:06:25 -04:00
Dan Cech d837be91ec switch to passing ReqContext as a property 2018-04-17 14:06:25 -04:00
Dan Cech e53315dce8 cleanup 2018-04-17 14:06:25 -04:00
Dan Cech a1b1d2fe80 switch to Result 2018-04-17 14:06:25 -04:00
Dan Cech d5dd1c9bca update auth proxy 2018-04-17 14:06:25 -04:00
Dan Cech 23f163e8cf fixes 2018-04-17 14:06:25 -04:00
Dan Cech d2eab2ff4c fix tests 2018-04-17 14:06:25 -04:00