Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								8784be9a14 
								
							 
						 
						
							
							
								
								feat(plugins): made it possible to have relative plugin template urls  
							
							 
							
							
							
						 
						
							2016-02-09 18:17:32 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								97ac81aa9c 
								
							 
						 
						
							
							
								
								feat(panels): upgradede singlestat panel  
							
							 
							
							
							
						 
						
							2016-01-27 19:07:39 -05:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								4f7fb40d9b 
								
							 
						 
						
							
							
								
								feat(panel plugin): improving panel plugin model  
							
							 
							
							
							
						 
						
							2016-01-24 16:39:25 -05:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								1adb7b286c 
								
							 
						 
						
							
							
								
								updated  
							
							 
							
							
							
						 
						
							2016-01-18 07:28:01 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								c1e94e61d0 
								
							 
						 
						
							
							
								
								feat(apps): lots of more work on apps, changed app_plugin to app_settings in order to to confuse the app plugin model (definition) and app org settings  
							
							 
							
							
							
						 
						
							2016-01-10 21:37:11 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								3bb20dbf2e 
								
							 
						 
						
							
							
								
								feat(plugins): changed plugin schema, pluginType -> type, type -> id  
							
							 
							
							
							
						 
						
							2016-01-08 23:15:44 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								ad94f99d57 
								
							 
						 
						
							
							
								
								refactor(apps): more WIP work on apps  
							
							 
							
							
							
						 
						
							2015-12-22 11:37:44 +01:00  
						
					 
				
					
						
							
							
								 
								woodsaj
							
						 
						
							 
							
							
							
							
								
							
							
								0903d5541b 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:grafana/grafana into externalPlugin  
							
							 
							
							... 
							
							
							
							Conflicts:
	pkg/api/api.go
	pkg/api/api_plugin.go
	pkg/api/datasources.go
	pkg/api/frontendsettings.go
	pkg/api/index.go
	pkg/plugins/models.go
	pkg/plugins/plugins.go 
							
						 
						
							2015-12-22 00:23:24 +08:00  
						
					 
				
					
						
							
							
								 
								woodsaj
							
						 
						
							 
							
							
							
							
								
							
							
								c35b51a268 
								
							 
						 
						
							
							
								
								refactor.  
							
							 
							
							... 
							
							
							
							Rename externalPlugin to apiPlugin
Rename bundle to app
Move js, css, menuItem and staticRoot to be properties os App
Add "app" field to panel, datasource and api plugin models. If populated
then the plugin is only enabled if the specific app is enabled for the Org.
If app is "", then the plugin is enabled for all orgs and can't be disabled. 
							
						 
						
							2015-12-17 23:53:58 +08:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								5eab5dc47b 
								
							 
						 
						
							
							
								
								feat(plugins): removed external plugins and bundle code, not ready for master yet, will revert this commit in seperate branch  
							
							 
							
							
							
						 
						
							2015-12-15 10:28:52 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								2ec5bc77d7 
								
							 
						 
						
							
							
								
								Merge branch 'external-plugins'  
							
							 
							
							
							
						 
						
							2015-12-15 10:10:48 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								201f50b121 
								
							 
						 
						
							
							
								
								Merge branch 'master' into external-plugins  
							
							 
							
							... 
							
							
							
							Conflicts:
	pkg/api/login.go
	public/app/core/routes/all.js
	public/app/core/table_model.ts
	public/app/panels/table/table_model.ts
	public/app/plugins/panels/table/editor.ts
	public/app/plugins/panels/table/table_model.ts 
							
						 
						
							2015-12-14 17:28:57 +01:00  
						
					 
				
					
						
							
							
								 
								Carl Bergquist
							
						 
						
							 
							
							
							
							
								
							
							
								548ee47aa7 
								
							 
						 
						
							
							
								
								Merge pull request  #3122  from shoonoise/hide_signout  
							
							 
							
							... 
							
							
							
							Disable sign out button in case of auth proxy enabled 
							
						 
						
							2015-12-14 17:18:04 +01:00  
						
					 
				
					
						
							
							
								 
								Mitsuhiro Tanda
							
						 
						
							 
							
							
							
							
								
							
							
								6edd6c8f03 
								
							 
						 
						
							
							
								
								add with_credentials to datasource model  
							
							 
							
							
							
						 
						
							2015-12-09 14:44:28 +09:00  
						
					 
				
					
						
							
							
								 
								woodsaj
							
						 
						
							 
							
							
							
							
								
							
							
								c4a0fe0234 
								
							 
						 
						
							
							
								
								add pluginBundle backend api methods and SQL storage  
							
							 
							
							
							
						 
						
							2015-12-03 23:43:55 +08:00  
						
					 
				
					
						
							
							
								 
								woodsaj
							
						 
						
							 
							
							
							
							
								
							
							
								bd4cb549d6 
								
							 
						 
						
							
							
								
								add pluginBundle support  
							
							 
							
							... 
							
							
							
							A plugnBundle is meta plugin that has a set of dependent plugins
to enable.  This commit includes a plugin.json for a default
"core" bundle that enables all of the shipped panels and datasources. 
							
						 
						
							2015-12-03 15:52:37 +08:00  
						
					 
				
					
						
							
							
								 
								shoonoise
							
						 
						
							 
							
							
							
							
								
							
							
								5cf3425b93 
								
							 
						 
						
							
							
								
								Disable sign out button in case of auth proxy enabled  
							
							 
							
							
							
						 
						
							2015-11-26 17:56:45 +03:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								4a69de1f30 
								
							 
						 
						
							
							
								
								feat(plugins): made panels work as plugins  
							
							 
							
							
							
						 
						
							2015-11-21 13:46:43 +01:00  
						
					 
				
					
						
							
							
								 
								Julius Volz
							
						 
						
							 
							
							
							
							
								
							
							
								3cc69112c1 
								
							 
						 
						
							
							
								
								Fix "Link to Prometheus" button for proxied Prometheus sources.  
							
							 
							
							
							
						 
						
							2015-10-01 18:23:29 +02:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								50281f12b9 
								
							 
						 
						
							
							
								
								fix(default datasource): minor fix for handling of default datasource  
							
							 
							
							
							
						 
						
							2015-08-18 14:54:56 +02:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								6ee0f2c6a7 
								
							 
						 
						
							
							
								
								feat(mixed data source queries): lots of minor polish to new mixed data source and all the changes it has required,  #436  
							
							 
							
							
							
						 
						
							2015-08-17 17:07:33 +02:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								a16c63a43e 
								
							 
						 
						
							
							
								
								feat(mixed datasources): continued work on editor design change  
							
							 
							
							
							
						 
						
							2015-08-16 20:52:30 +02:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								24bab47f14 
								
							 
						 
						
							
							
								
								fix(create org): Anonymous user can no longer create org,  Fixes   #2227  
							
							 
							
							
							
						 
						
							2015-06-25 17:06:43 +02:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								5962bcbc6c 
								
							 
						 
						
							
							
								
								Do not show create org link when allow_org_create is set to false,  Fixes   #2135  
							
							 
							
							
							
						 
						
							2015-06-11 08:16:09 +02:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								85c3a0aa14 
								
							 
						 
						
							
							
								
								Panel menu now hides edit actions for users with role Viewer,  Closes   #1826  
							
							 
							
							
							
						 
						
							2015-06-01 16:36:15 +02:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								592330b5a7 
								
							 
						 
						
							
							
								
								Expose data source extended properties (jsonData), to the frontend,  Closes   #2023  
							
							 
							
							
							
						 
						
							2015-05-20 18:29:20 +02:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								f7b4f331f3 
								
							 
						 
						
							
							
								
								Updating docs  
							
							 
							
							
							
						 
						
							2015-03-27 14:23:23 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								477e035f2e 
								
							 
						 
						
							
							
								
								Fixed anonymous access mode,  Closes   #1586  
							
							 
							
							
							
						 
						
							2015-03-11 17:34:11 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								9710771f16 
								
							 
						 
						
							
							
								
								Added basic auth to data source edit/create, add support for basic auth in data source proxy code,  Closes   #1510  
							
							 
							
							
							
						 
						
							2015-03-02 09:58:35 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								232f980c72 
								
							 
						 
						
							
							
								
								More work on restoring features after moving to plugin model for datasources, no annotations work again  #1276   #1472  
							
							 
							
							
							
						 
						
							2015-02-28 10:52:25 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								9e892bddf0 
								
							 
						 
						
							
							
								
								More work on restoring features after moving to plugin model for datasources,  #1276   #1472  
							
							 
							
							
							
						 
						
							2015-02-28 09:46:37 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								c198242292 
								
							 
						 
						
							
							
								
								A lot of work on backend plugin model for frontend components, right now for data sources, will enable dropin plugins for data sources and panels,  #1472  
							
							 
							
							
							
						 
						
							2015-02-27 22:29:00 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								5bd5713a52 
								
							 
						 
						
							
							
								
								Began work on plugin system  
							
							 
							
							
							
						 
						
							2015-02-27 13:45:00 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								ae7f18f981 
								
							 
						 
						
							
							
								
								Made a copy of influxdb datasource named influxdb_08 so the main influxdb data source can be modified to support InfluxDB 0.9, made some initial experiments to get queries to work, but a lot more work is needed,  #1525  
							
							 
							
							
							
						 
						
							2015-02-25 18:43:44 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								26e4809e2e 
								
							 
						 
						
							
							
								
								Big Backend Refatoring: Renamed Account -> Org  
							
							 
							
							
							
						 
						
							2015-02-23 20:07:49 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								60ae4afe87 
								
							 
						 
						
							
							
								
								Refresh frontend datasourceSrv after datasource update, no longer need to reload the page to use a newly added or updated datasource,  #1493  
							
							 
							
							
							
						 
						
							2015-02-18 14:06:44 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								10820f31c2 
								
							 
						 
						
							
							
								
								Changed go package path  
							
							 
							
							
							
						 
						
							2015-02-05 10:37:13 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								90925273a0 
								
							 
						 
						
							
							
								
								User / Account model split, User and account now seperate entities, collaborators are now AccountUsers  
							
							 
							
							
							
						 
						
							2015-01-19 18:01:04 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								9a29b04561 
								
							 
						 
						
							
							
								
								Dashboard import/export now works  
							
							 
							
							
							
						 
						
							2015-01-17 10:39:26 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								22156fe309 
								
							 
						 
						
							
							
								
								Big refactoring for context.User, and how current user info is fetching, now included collaborator role  
							
							 
							
							
							
						 
						
							2015-01-16 14:32:18 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								8e65f36131 
								
							 
						 
						
							
							
								
								Added system admin skeleton  
							
							 
							
							
							
						 
						
							2015-01-11 12:12:29 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								68cc3f86dd 
								
							 
						 
						
							
							
								
								Handle default datasource management  
							
							 
							
							
							
						 
						
							2015-01-09 16:36:23 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								d06174fb56 
								
							 
						 
						
							
							
								
								Added build script written in go that adds build symbols for version, commit and build date  
							
							 
							
							
							
						 
						
							2015-01-05 10:46:58 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								4cc8a9bd18 
								
							 
						 
						
							
							
								
								More work on getting grafana pro to work in sub url  
							
							 
							
							
							
						 
						
							2015-01-05 07:59:18 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								164d11c816 
								
							 
						 
						
							
							
								
								InfluxDB now works in proxy mode, influxdb username and password is added in the backend and never exposed to frontend,  #8  
							
							 
							
							
							
						 
						
							2014-12-29 13:36:08 +01:00