root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 25 Packages Projects Releases Wiki Activity
12,156 Commits 1,400 Branches 636 Tags 2.5 GiB
Commit Graph

495 Commits

Author SHA1 Message Date
bergquist 53dddf1a8f fix(oauth): remove github refs from generic auth 2016-09-07 10:55:46 +02:00
Torkel Ödegaard fbae6abb3c feat(alerting): progress on handling no data in alert query, #5860 2016-09-06 20:40:12 +02:00
bergquist 2ca7284a56 tech(notifications): splitt into 3 queries 
closes #5883
 2016-09-06 08:43:15 +02:00
bergquist c893e5d241 feat(notifications): add support for default notifications 
ref #5883
 2016-09-05 21:35:37 +02:00
Torkel Ödegaard 09cdf3e9e1 feat(alerting): show execution errors in alert list 2016-08-18 11:37:35 +02:00
Torkel Ödegaard 63a283b4bc feat(alerting): working on alert state filters for alert list 2016-08-17 11:00:00 +02:00
bergquist 6497b307c4 feat(alerting): save execution error upon state changed 2016-08-17 09:27:29 +02:00
bergquist 9915f15ed0 feat(alerting): adds sql layer for saving execution errors 2016-08-17 07:49:14 +02:00
Torkel Ödegaard f934081bcb feat(alerting): making progress on alerting list, #5784 2016-08-16 09:52:45 +02:00
Torkel Ödegaard 0392fde34e feat(alerting): doing schema changes 2016-08-15 15:12:43 +02:00
bergquist 16e75a3036 feat(alerting): add alert message to slack integration 2016-08-12 10:12:04 +02:00
Torkel Ödegaard 357358898d feat(annotations): working on alert annotations, #5694 2016-08-01 10:07:00 +02:00
Torkel Ödegaard 4fc50742a0 feat(alerting): working on image rendering with alert notifications 2016-07-29 14:55:02 +02:00
Torkel Ödegaard a6c6094775 feat(alerting): started reworking notifications 2016-07-22 16:45:17 +02:00
Torkel Ödegaard 7eb2d2cf47 feat(alerting): working on state management 2016-07-22 13:14:09 +02:00
Torkel Ödegaard 783d697529 feat(alerting): more output when testing alert 2016-07-21 21:54:12 +02:00
Torkel Ödegaard f872d5cfa3 feat(alerting): more refactoring work in backend code 2016-07-19 22:36:59 +02:00
Torkel Ödegaard 0f555d6ab5 fix(alerting): minor fix 2016-07-19 09:28:49 +02:00
Torkel Ödegaard f13b869aa4 feat(alerting): work on alerting 2016-07-14 13:32:16 +02:00
Torkel Ödegaard d9096110f8 Merge branch 'master' into alerting 
Conflicts:
	pkg/api/dashboard.go
	pkg/models/dashboards.go
	pkg/services/sqlstore/dashboard.go
 2016-07-11 18:28:07 +02:00
Torkel Ödegaard 68a8d9bc91 feat(apps): more work on plugin dashboard sync 2016-07-08 13:41:46 +02:00
Torkel Ödegaard 85be7dd902 feat(apps): progress on app dashboard sync 2016-07-08 12:26:51 +02:00
Torkel Ödegaard d44325affd feat(apps): progress on app dashboard imports 2016-07-08 09:35:06 +02:00
Torkel Ödegaard b62f1f00cd feat(apps): auto update dashboard dashboards, #5529 2016-07-07 18:11:03 +02:00
bergquist 4fc16c36ed feat(alerting): saves new state when alert updates 2016-06-29 00:05:48 +02:00
bergquist 48e1a17ac2 feat(alerting): remove dummie values from email notifier 2016-06-23 16:30:12 +02:00
bergquist 67197d54f9 feat(alerting): add triggeredAlerts as json to alert_state 2016-06-23 11:14:40 +02:00
bergquist 488b42377b feat(alerting): update state if not been updated for 15min 2016-06-23 11:03:27 +02:00
bergquist fa309ec925 feat(alerting): add default notification group 2016-06-20 15:24:48 +02:00
bergquist ebada26b85 Merge branch 'alerting' into alerting_notifications 2016-06-17 08:27:58 +02:00
bergquist e8a324c7f5 feat(alerting): add frequency back to alert model 2016-06-17 08:27:38 +02:00
bergquist a0418da160 Merge branch 'alerting' into alerting_notifications 2016-06-16 16:49:16 +02:00
bergquist 8ec311ade4 Merge branch 'master' into alerting 2016-06-16 16:29:41 +02:00
bergquist b907ce341c feat(alerting): enables deletes for alert notifications 2016-06-16 15:21:44 +02:00
bergquist 7f767224af feat(alerting): basic support for creating and updating notifications 2016-06-16 14:29:20 +02:00
bergquist 2e809cae05 tech(alerting): enforce POST for webhooks 2016-06-16 08:16:16 +02:00
bergquist efea3bc9cb feat(alerting): skeleton commit for webhook 2016-06-16 08:16:16 +02:00
bergquist b9b65cf2d4 tech(alerting): add logging about failed notifications 2016-06-16 08:16:16 +02:00
bergquist 9a8416416d feat(alerting): converter for db model to notification 2016-06-16 08:16:16 +02:00
bergquist dbf3795aaf feat(alerting): add sql layer for alert notifications 2016-06-16 08:16:16 +02:00
bergquist 8b91e57ef6 feat(alerting): notification query 2016-06-16 08:16:16 +02:00
Torkel Ödegaard dac8b35a1a feat(alerting): renamed scheduler to handler 2016-06-13 15:58:22 +02:00
bergquist 7f22b9eb6e tech(alerting): expression -> settings 2016-06-13 15:18:19 +02:00
bergquist bb6888885e fix(alerting): makes valid to save more explicit 2016-06-13 15:01:07 +02:00
Nozomi Anzai 6586cc4029 Add the datasource of RDBMS (PostgreSQL and MySQL) 2016-06-13 18:24:18 +09:00
bergquist 1e41eb8c97 tech(alerting): remove frequency from alert model 2016-06-13 10:42:36 +02:00
Torkel Ödegaard a362984c57 feat(alerting): renamed AlertRuleModel to just Alert, think making a distinction between an Alert and an Alert Rule is just confusing and was a mistake on my part 2016-06-11 10:26:48 +02:00
Torkel Ödegaard 2b4a9954b1 feat(alerting): progress on alerting UI and model, refactoring of dashboard parser and tests into extractor component, moved tests from sqlstore to alerting package 2016-06-11 10:13:33 +02:00
bergquist ea8fb66f73 test(alerting): fixes broken unittests 2016-06-10 13:47:54 +02:00
bergquist 0c69c5afb1 test(alerting): fixes broken unittests 2016-06-10 11:37:03 +02:00
bergquist ef35184a80 feat(alerting): rename alertrule model to alertruleDAO 2016-06-10 10:00:00 +02:00
bergquist fdf051ad5a feat(alerting): begin alert rule storage refactoring 2016-06-09 22:21:28 +02:00
bergquist 544073b7e1 feat(alerting): make sure saved alerts are valid 2016-06-09 10:27:23 +02:00
bergquist a1f97e0b77 feat(alerting): add heartbeat writer 2016-06-09 10:00:34 +02:00
Torkel Ödegaard 34e17f7282 feat(alerting): requests looks to be working again 2016-06-06 17:11:46 +02:00
Torkel Ödegaard 7a34c129fe feat(alerting): things are compiling and tests pass 2016-06-06 13:50:47 +02:00
Torkel Ödegaard a191b9b1cf feat(alerting): moved alerting models back to alerting package, models is more for storage dtos 2016-06-06 10:31:21 +02:00
bergquist 6a49d4ed6b feat(alerting): remove orgid from alertrule query 2016-06-03 15:24:53 +02:00
bergquist 2cf797b567 tech(alerting): minor refactoring and code style 2016-06-03 15:01:42 +02:00
bergquist 50d98b161c feat(alerting): adds support for retries 2016-06-03 09:04:20 +02:00
bergquist cc65dd8bcf tech(alerting): use pointers for updating alertjobs 2016-06-03 08:33:53 +02:00
bergquist 910253bc42 tech(alerting): remove datasource ref from alertjob 2016-06-03 07:40:47 +02:00
bergquist 4e1f801f6c feat(alerting): add serie name to failed alert description 2016-05-31 21:02:26 +02:00
bergquist 7c3dbe2a38 chore(alerting): move aggregations into alerting package 2016-05-31 15:29:56 +02:00
bergquist 7224ea5229 chore(alerting): convert alert levels to float 2016-05-31 14:18:12 +02:00
bergquist 338fdcb576 feat(alerting): add copy of AlertRule to AlertResult 2016-05-31 13:27:12 +02:00
bergquist b75631e021 chore(alerting): move alert result to models 2016-05-30 19:08:04 +02:00
bergquist 1498db11a9 feat(alerting): extracts alert rule reading 2016-05-30 18:52:38 +02:00
bergquist c5c261e955 feat(alerting): improve spacing in alerting tab 2016-05-30 17:50:35 +02:00
bergquist 077be210da tech(alerting): change interval -> frequency 2016-05-30 09:31:05 +02:00
bergquist 16a9e56eca tech(alerting): change queryrange to int from str 2016-05-30 09:18:22 +02:00
Torkel Ödegaard 0d4c76a029 feat(import): save gnetId for dashbards imported from grafana.net 2016-05-27 16:42:32 +02:00
bergquist 5f2447976c style(alerting): add note about making timeseries model safer 2016-05-27 15:28:47 +02:00
bergquist abc1ae3956 feat(alerting): add timeserie aggregation functions 2016-05-27 14:59:13 +02:00
bergquist 422234d03a feat(alerting): abstract graphite from executor 2016-05-27 12:06:41 +02:00
bergquist 8ac635b631 style(alerting): change const names 2016-05-26 07:41:23 +02:00
bergquist 957cb407c5 feat(alerting): naiv graphite executor 2016-05-25 17:21:20 +02:00
bergquist b2a4d8083e feat(alerting): add datasource ref to alert rule 2016-05-25 12:57:49 +02:00
bergquist 77ec575b46 tech(alerting): fixes broken unit-tests 2016-05-23 14:51:41 +02:00
bergquist f05cae23d2 feat(alerting): alert rule selector 2016-05-23 10:07:04 +02:00
bergquist 9d016a2756 feat(alerting): add migration for create and update 2016-05-20 14:23:24 +02:00
bergquist 8dbb5bad4b test(alerting): fix broken unit tests 2016-05-16 16:20:28 +02:00
Torkel Ödegaard 77b7cdfadb feat(alerting): added few fields to alert rule 2016-05-16 15:39:09 +02:00
bergquist 1bb8bc58b8 feat(alerting): add parameteters for filtering alerts 2016-05-10 09:45:56 +02:00
bergquist 1be513fabd feat(alerting): add support for alert page filter 2016-05-09 14:44:44 +02:00
bergquist 3e462f2914 chore(alerting): style refactoring 2016-05-09 12:10:53 +02:00
bergquist 47070f2d1f chore(alerting): struct names and url refactoring 2016-05-09 11:25:21 +02:00
bergquist 26941284da feat(alerting): add limit and since id options for alert logs 2016-05-04 09:57:53 +02:00
bergquist 1624dc9dfd feat(alerting): separate operator and level 2016-05-03 17:31:04 +02:00
bergquist 743a6fa37c feat(alerting): add support for deleting alert rules 2016-05-02 16:07:19 +02:00
bergquist bc892789c1 feat(alerting): change state from ALERT to CRITICAL 2016-05-02 14:33:38 +02:00
bergquist f442adca47 feat(alerting): adds api endpoints for alerts per dashboard and panel 2016-04-28 15:13:42 +02:00
bergquist 0f0fa0c257 feat(alerting): adds endpoint for getting alert states log 2016-04-28 10:59:46 +02:00
bergquist e7be7d2835 feat(alerting): add api endpoint for alert state 2016-04-28 08:23:50 +02:00
bergquist 3cf6532515 feat(alerting): add json encoding name for properties 2016-04-27 11:44:04 +02:00
bergquist 7041169ffb feat(alerting): add datasource name field 2016-04-27 09:06:19 +02:00
bergquist 973db1ac38 feat(alerting): add api route for alert changes 2016-04-27 08:59:33 +02:00
bergquist 9b50313f11 feat(alerting): add api endpoints for listing alerts 2016-04-26 17:36:50 +02:00
bergquist 55e83a3d62 feat(alerting): rename alerting dashboard names 2016-04-26 16:06:29 +02:00
bergquist bb42579b0f Merge branch 'master' into alerting_definitions 2016-04-25 16:42:33 +02:00
bergquist ddd826616b feat(alerting): serialize whole target obj from dashboard 2016-04-25 16:38:27 +02:00
bergquist 25f6ec8b53 feat(alerting): add support for alert_rule updates 2016-04-25 16:18:28 +02:00
bergquist c83af353b2 feat(alerting): renames alert table to alert_rule 2016-04-25 14:42:24 +02:00
Torkel Ödegaard 04a79175bf fix(plugins): only add app nav link if it has any pages/dashboards with role matching current user, fixes #4784 2016-04-25 14:00:49 +02:00
bergquist ba5978abd3 Merge branch 'master' into alerting_definitions 2016-04-22 15:52:56 +02:00
bergquist 51de894692 fix(snapshots): sets default value for snapshot name 
make it possible for < 3.0 instances to publish snapshots

ref #4778
 2016-04-21 09:59:48 +02:00
bergquist 96e88ee84d refactor(alerting): changes interval to string from int 2016-04-20 16:57:03 +02:00
bergquist ef92fd4ebc feat(alerting): renames error_level to crit_level 2016-04-20 15:02:49 +02:00
bergquist 7860a2a1b8 feat(alerting): make sure dashboard id exists 2016-04-20 09:55:32 +02:00
bergquist 832e38af34 feat(alerting): limit alerts to one per panel 2016-04-19 15:34:23 +02:00
bergquist daa5468801 feat(alerting): parses dashboard alerts 2016-04-18 14:15:03 +02:00
bergquist 769016783f feat(alerting): add aggregator field 2016-04-18 11:10:52 +02:00
bergquist 91a1a823e2 feat(alerting): add basic tables for alerting definitions 2016-04-13 10:33:45 +02:00
Torkel Ödegaard 9c14b9672f fix(): admin stats and postgres 2016-04-11 18:16:35 -04:00
Torkel Ödegaard ab1048b7ee feat(preferences): theme and home dashbord settings now work work on profile and org settings page 2016-04-02 13:54:06 -07:00
utkarshcmu 66621d762e Added getDashboardSlugById api 2016-03-17 01:01:58 -07:00
utkarshcmu 9dd6aefcec Minor corrections 2016-03-16 23:35:06 -07:00
utkarshcmu 749fd618a9 Saving home dashboard id in table 2016-03-16 23:22:27 -07:00
Torkel Ödegaard a88176e060 feat(preferences): lots of refactoring and changes to #3214 2016-03-15 22:49:52 +01:00
Torkel Ödegaard e06756bcab Merge branch 'preferences' of github.com:grafana/grafana into preferences 2016-03-15 22:15:27 +01:00
Torkel Ödegaard 9c222a445f Merge branch 'master' into preferences 2016-03-15 22:14:35 +01:00
utkarshcmu e371e03696 Able to save preference version, created, updated fields 2016-03-14 03:12:52 -07:00
Torkel Ödegaard 0398face05 feat(plugins): dashboard import for data sources is working! #4298 2016-03-12 10:13:49 +01:00
Torkel Ödegaard 3fb0b71822 refactor(): refactoring json usage 2016-03-12 00:13:06 +01:00
Torkel Ödegaard 1f9f439acb lib(): added simplejson lib 2016-03-11 23:28:33 +01:00
utkarshcmu 43b474143c Preferences model updated 2016-03-11 06:30:05 -08:00
Torkel Ödegaard 2de439bd1e feat(plugins): progress on dashboard installs , #4298 2016-03-11 09:57:20 +01:00
Torkel Ödegaard 60adcedebe feat(plugins): worked on plugin dashboard import handling 2016-03-10 19:57:48 +01:00
Torkel Ödegaard dfaa6d8eb9 feat(plugins): a lot of work on #4298 2016-03-08 18:17:47 +01:00
utkarshcmu 9c8d508247 Made API handling better, removed unused components 2016-03-06 12:32:22 -08:00
utkarshcmu 8f42bec270 Implemented GetUserPreferences API 2016-03-06 11:42:15 -08:00
utkarshcmu 660d3fa1e9 Implemented savePreferences API 2016-03-06 03:47:39 -08:00
utkarshcmu cf926134ef Added savePreferencesAPI 2016-03-05 13:15:49 -08:00
Torkel Ödegaard 8db7cf49a6 feat(plugins): began refactoring AppSettings -> PluginSettings, and have the plugins list view and plugin edit view be common for all plugins 2016-02-25 14:55:31 +01:00
Torkel Ödegaard 37c6a1ddf0 feat(app routes): worked on app routes, added unit test, changed Grafana-Context header to start with X to be standard compliant, got cloud saas queries to work via app route feature and header template 2016-02-10 16:43:35 +01:00
Torkel Ödegaard fcc960e9a2 Merge pull request #3792 from utkarshcmu/snapshot-view 
UI Review: Snapshot view
 2016-02-05 08:49:23 +01:00
utkarshcmu 338afc80d5 Merge branch 'master' of https://github.com/grafana/grafana into metadata 2016-02-01 10:32:36 -08:00
Torkel Ödegaard 12460af0ec Merge pull request #3830 from raintank/apiPlugin 
Add secureJsonData field to appSettings model
 2016-01-29 17:17:37 -05:00
bergquist 73d6b95339 chore(playlist): remove unused code 2016-01-29 20:24:06 +01:00
Anthony Woods 2e9272c778 Merge remote-tracking branch 'upstream/master' into apiPlugin 2016-01-30 01:38:01 +08:00
bergquist d27bb4d3fb style(playlist): move dashboard access to dashboard.go 2016-01-29 01:41:23 +01:00
bergquist 64a18874e1 style(playlist): remove unused code 2016-01-29 01:23:51 +01:00
utkarshcmu 58121d89fc Updated http_api docs 2016-01-27 22:02:33 -08:00
utkarshcmu 753fd164d7 Added createdBy in metadata ui and dashboard table 2016-01-27 17:11:21 -08:00
Carl Bergquist 251bf7a2b4 Merge pull request #3840 from utkarshcmu/stats 
Grafana stats view as mentioned in #3812
 2016-01-27 19:41:10 +01:00
bergquist 52403ca17e feat(playlist): add usage statisics 2016-01-25 21:39:45 +01:00
utkarshcmu 2190392e05 Added grafana_admins count 2016-01-25 00:39:31 -08:00
utkarshcmu da67afa51e Fixed api bugs, stats endpoint working 2016-01-24 21:18:17 -08:00
utkarshcmu c7fae5386d Added backend API for stats 2016-01-24 11:01:33 -08:00
Anthony Woods 32f78d465b add secureJsonData to appSettings model. 
- adds the new column to the DB table.
- data stored in the DB is encrypted
- update appRouteHeaders templates to use the jsonData and
decrypted secureJsonData
 2016-01-23 06:17:22 +08:00
Anthony Woods 423eca6e7d add support for fetching appSettings by appId 2016-01-21 11:41:02 +08:00
utkarshcmu aa1d28835d Fixed angularjs variable names 2016-01-19 23:23:44 -08:00
utkarshcmu ca55d1f315 Minor bug fixes 2016-01-19 05:05:24 -08:00
utkarshcmu 41fd0ed467 Merge branch 'master' of https://github.com/grafana/grafana into snapshot-view 2016-01-19 05:05:03 -08:00
utkarshcmu 8f067a5ed2 Added backend functionality for searching snapshots 2016-01-19 01:37:36 -08:00
utkarshcmu 1952ebf7c4 Fixed failing gofmt tests 2016-01-19 00:33:30 -08:00
utkarshcmu 70481953fd Snapshot name is saved in DB now 2016-01-19 00:26:20 -08:00
Torkel Ödegaard 66eebd1ac3 refactor(playlist): refactor of playlist feature, and PR #3776 2016-01-18 16:01:14 +01:00
Torkel Ödegaard e5b3f27a30 Merge branch 'apps' 2016-01-12 15:41:15 +01:00
bergquist e8786b0747 feat(playlist): renames timespan to interval 2016-01-12 13:56:47 +01:00
bergquist 8a38991270 feat(playlist): changes to relation table 
Also introduces an abstraction between playlist and dashboard.
This will make it possible to att search, and tag filtering to
playlists without any major refactoring
 2016-01-12 08:17:44 +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
bergquist 0918063c55 fix(playlist): move dashboard uri cration to Backend 2016-01-08 16:13:49 +01:00
nikita-graf ee400df930 remove dashboard from playlist when its destroyed 2016-01-05 04:14:39 +03:00
utkarshcmu bcaaedf2ff Resurrected nikita-graf's work and added playlistType for future use 2015-12-22 02:07:15 -08:00
Torkel Ödegaard eacc46da6d feat(plugins): WIP on new apps concept 2015-12-21 23:09:27 +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
utkarshcmu cb5c1bd24d Removed created_by and fixed gofmt 2015-12-18 02:30:20 -08:00
utkarshcmu af371249f9 Successfully displayed userdId in UI 2015-12-18 01:52:05 -08:00
utkarshcmu c433167950 Merged with master, resolved conflicts 2015-12-18 00:23:08 -08:00
utkarshcmu e0ffcda32e Added UI , DB settings 2015-12-18 00:20:23 -08:00
woodsaj 3d15ee6d74 allow app menu items to be selectivly pinned to the left nav menu 2015-12-18 15:10:52 +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 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
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
utkarshcmu 1b7f4f31ca Tired of gofmt 2015-11-20 04:52:50 -08:00
utkarshcmu ca01604b43 Added statements in constructor 2015-11-20 04:37:24 -08:00
utkarshcmu 93f9a0c39c Fixed created & updated columns in dashboard table 2015-11-20 03:10:24 -08:00
utkarshcmu f5db9950f8 fixed gofmt tests 2015-11-16 07:28:38 -08:00
utkarshcmu 9485e8cfee /api/admin/users returns user ID 2015-11-16 06:55:02 -08:00
Torkel Ödegaard 323e84375b refactoring: minor refactoring and handling of known data source plugins 2015-10-26 16:37:45 +01:00
Torkel Ödegaard c816ed2527 feat(usage stats): added data source count stats 2015-09-29 13:47:56 +02:00
woodsaj 86ed85aa6e move toMap function to be a method on the quota structs 2015-09-15 17:18:26 +08:00
woodsaj 6488324cf1 enhance quota support. 
now includes:
- perOrg (users, dashboards, datasources, api_keys)
- perUser (orgs)
- global (users, orgs, dashboards, datasources, api_keys, sessions)
 2015-09-11 23:17:10 +08:00
woodsaj 852f9bd277 refactor quota settings 2015-09-11 01:47:33 +08:00
woodsaj 3d4d822528 implement updateQuota function 2015-09-11 01:04:29 +08:00
woodsaj 0688050552 add quota middleware to enforce quotas. issue #321 
Conflicts:
	pkg/api/api.go
 2015-09-11 01:03:47 +08:00
woodsaj 9023171940 inital backend suport for quotas. issue #321 
Conflicts:
	conf/defaults.ini
	main.go
	pkg/services/sqlstore/migrations/migrations.go
 2015-09-11 01:01:36 +08:00
Torkel Ödegaard fad1d4cf98 feat(organization): added update org address to http api and to org details settings view, closes #2672 2015-09-08 14:22:44 +02:00
Torkel Ödegaard daf64421f2 fix(api): Added error handling to create and update org http apis and sql update handlers, now checks for org name taken scenarios and returns correct http error code and message, fixes #2686 2015-09-08 13:06:18 +02:00
Torkel Ödegaard 3ed63d09d9 Merge branch 'master' into cloudwatch 2015-09-01 17:25:36 +02:00
Torkel Ödegaard aa89416bca fix(invite): fixes to org invite stuff, #2630 2015-09-01 12:35:06 +02:00
Torkel Ödegaard ffbf70af25 Merge branch 'cloudwatch' of https://github.com/mtanda/grafana into cloudwatch 2015-08-31 15:45:49 +02:00
Torkel Ödegaard d19e101e6b feat(signup): almost done with new sign up flow, #2353 2015-08-31 11:35:07 +02:00
Torkel Ödegaard de0f04ec3c feat(signup): progress on new sign up and email verification flow, #2353 2015-08-28 15:14:24 +02:00
Torkel Ödegaard d25624a8ad feat(signup): began work on new / alternate signup flow that includes email verification, #2353 2015-08-27 13:59:58 +02:00
Mitsuhiro Tanda 00f76ecaf6 CloudWatch proxy support 2015-08-20 00:51:23 +09:00
Torkel Ödegaard 1ea0b5371a feat(invite): new user invites are now also added to correct org after sign up is completed, #2353 2015-08-11 10:45:03 +02:00