Torkel Ödegaard
c75aa23092
New implementation for API Keys that only stores hashed api keys, and the client key is base64 decoded json web token with the unhashed key, Closes #1440
2015-02-26 17:23:28 +01:00
Torkel Ödegaard
7c241fd617
Added permissions section to admin > edit user view, an admin can now make another user admin, Closes #1517
2015-02-26 15:43:48 +01:00
Torkel Ödegaard
3f96afba73
Merge branch 'fixDashboardDelete' of https://github.com/raintank/grafana into raintank-fixDashboardDelete
...
Conflicts:
pkg/services/sqlstore/dashboard.go
2015-02-25 14:31:44 +01:00
Torkel Ödegaard
563d5e3ad8
All migrations work in sqlite3, mysql and postgres
2015-02-25 07:57:51 +01:00
Torkel Ödegaard
16fd256225
Added missing common.go
2015-02-24 19:10:41 +01:00
Torkel Ödegaard
f3f79792ab
account -> org table migration is starting to work, need to test mysql and postgres
2015-02-24 18:32:29 +01:00
Torkel Ödegaard
ed68a4bb9a
More work on SQL migrations
2015-02-24 17:59:21 +01:00
Torkel Ödegaard
02a89c752b
Progress on database schema migration for account -> org refactor
2015-02-24 11:46:34 +01:00
Anthony Woods
b9b63f695d
fixes #1518 fix table name used in dashboard delete.
2015-02-24 08:56:10 +00:00
Torkel Ödegaard
da41d99aa7
Fixed sql integration test
2015-02-23 20:48:43 +01:00
Torkel Ödegaard
26e4809e2e
Big Backend Refatoring: Renamed Account -> Org
2015-02-23 20:07:49 +01:00
Torkel Ödegaard
47c6c6e1b7
Added change password feature, Closes #1455
2015-02-19 16:09:49 +01:00
Torkel Ödegaard
17004ce3ae
Fixed issue with login by username and uppercase letters in username, #1484
2015-02-18 13:00:39 +01:00
Torkel Ödegaard
56d8fe4a22
Small changes to CLI commands PR
2015-02-16 07:40:21 +01:00
Jason Wilder
f443b7087c
CLI: Add datasource:info command
...
Describes the full datasource details given an account and
datasource name.
2015-02-15 13:36:10 -07:00
Jason Wilder
90cd10e034
CLI: Add account:delete command
2015-02-15 13:36:10 -07:00
Jason Wilder
ca37b24455
CLI: Add account list command
2015-02-15 13:36:10 -07:00
Torkel Ödegaard
a88187023d
Added a sql integration test for api keys
2015-02-13 15:55:32 +01:00
woodsaj
7d69885e06
fixes #1481 . correctly escape api_key.key column name
...
'key' is a reserved word in mysql. So when building a query,
the api-key.key column name needs to be escaped
2015-02-13 22:00:03 +08:00
Torkel Ödegaard
79f798f67b
Configuration file options can now be overriden using environment variables using GF_<SectionName>_<KeyName> syntax, if Section name contains dots in config they are replaced with underscores, and the section name and keyname needs to be all upper case, #1473
2015-02-12 13:31:41 +01:00
Torkel Ödegaard
2c16b0f0f3
added unit test for loading configuration file
2015-02-12 11:55:55 +01:00
Torkel Ödegaard
0140a00884
Added two columns to user table, email_verified and theme, no used right now but will probably shortly
2015-02-12 10:32:22 +01:00
Torkel Ödegaard
71f09ddd94
Added delete user action to user admin api, and made it work in UI, Closes #1466 , #1446
2015-02-11 16:47:22 +01:00
Torkel Ödegaard
e165e2af95
Worked on user admin features, can now create and edit users as a grafana admin user, #1446
2015-02-10 15:36:51 +01:00
Torkel Ödegaard
23bbc5160e
Fixed validation for adding api keys, added unique index for api key name + account_id
2015-02-07 13:11:39 +01:00
Torkel Ödegaard
f8a10fa7af
Updated account and profile pages, very temporary solution, do not like it at all
2015-02-06 08:21:00 +01:00
Torkel Ödegaard
e3764ad951
Fixed failing dashboard sql test
2015-02-05 15:53:15 +01:00
Torkel Ödegaard
8e1b753664
Added limit to dashboard list panel and search
2015-02-05 11:10:56 +01:00
Torkel Ödegaard
0f63c04beb
Fixed bug in user creation and admin role
2015-02-05 10:50:18 +01:00
Torkel Ödegaard
10820f31c2
Changed go package path
2015-02-05 10:37:13 +01:00
Torkel Ödegaard
076905d14e
Added isStarred to search result hit, very inefficient loading right now but can be cached later on
2015-02-05 09:49:00 +01:00
Torkel Ödegaard
896e6d4662
Merge branch 'notifications'
2015-02-04 17:15:16 +01:00
Torkel Ödegaard
d8db5189c1
More work on events, still have to convert pascal case event type name to rabbitmq dot notation, but after that should be done
2015-02-04 17:15:05 +01:00
Torkel Ödegaard
525179eb85
Added on wire event format
2015-02-04 16:57:20 +01:00
Torkel Ödegaard
dace35d31d
Missed setting account name
2015-02-04 15:41:40 +01:00
Torkel Ödegaard
3752379106
Worked on event system, needs a little more work
2015-02-04 15:37:26 +01:00
Torkel Ödegaard
60541a455f
Worked on search filter flag IsStarred, and updated frontend with new dashboard list panel
2015-02-04 11:35:59 +01:00
woodsaj
a712f1a231
Add inital implementation of Notification events.
...
If notifications are enabled in the config, Adds a eventHandler
accepting Notification{} payloads to the internal Bus. The
eventHandler then marshals the payload into json and sends it
to a rabbitmq topic exchange using the
Notification.Priority+Noticiation.EventType as the routing key.
eg. INFO.account.created
Currently, notifications are only being emitted for
INFO.account.created
INFO.account.updated
INFO.user.created
INFO.user.updated
2015-02-03 23:57:42 +08:00
Torkel Ödegaard
97758380e0
Worked on stars in search results
2015-02-02 17:17:57 +01:00
Torkel Ödegaard
ad3d15e28d
Worked on dashboard starring and unstarring, renamed favorite model to star
2015-02-02 11:32:32 +01:00
Torkel Ödegaard
1d6413bfae
More work on backend for user favorites
2015-01-29 12:10:34 +01:00
Torkel Ödegaard
e02e60171e
Began work on user favorites backend support & storage
2015-01-28 15:29:36 +01:00
Torkel Ödegaard
a5e450a0dd
Worked on anonymous access
2015-01-27 15:45:27 +01:00
Torkel Ödegaard
757b185398
Worked on ease of use for non multi tenant scenarios, Closes #20
2015-01-27 15:14:53 +01:00
Torkel Ödegaard
257519490a
Worked on login remember cookie, and redirect after login
2015-01-27 12:05:23 +01:00
Torkel Ödegaard
95305e7e11
Changed from goconfig to its new counter part go-ini
2015-01-27 10:09:54 +01:00
Torkel Ödegaard
951ce0a102
API token -> API key rename
2015-01-27 08:26:11 +01:00
Torkel Ödegaard
5ba2423626
Worked on account update view
2015-01-26 15:42:22 +01:00
Torkel Ödegaard
3c8c53194f
Sign up and login work
2015-01-21 09:52:40 +01:00
Torkel Ödegaard
9e6df378c3
worked on account creation
2015-01-20 16:29:48 +01:00
Torkel Ödegaard
eec178458b
Validation check for not removing the last account admin
2015-01-20 15:48:19 +01:00
Torkel Ödegaard
4ea5d80099
Various fixes to data access
2015-01-20 15:23:14 +01:00
Torkel Ödegaard
0a695ba17a
Final work on migration, now there is no usage of xorm table sync
2015-01-20 14:44:37 +01:00
Torkel Ödegaard
afb847acc8
a lot of work on database schema and migration setup, postgres now works, every integration test passes for all database types, only token table left to do
2015-01-20 14:15:48 +01:00
Torkel Ödegaard
8bb9126b77
added postgres support for db migrations
2015-01-20 09:20:44 +01:00
Torkel Ödegaard
2379c5b770
Added loglevel to migrator, added dashboard table & index migrations
2015-01-20 08:50:08 +01:00
Torkel Ödegaard
e750508d76
Fixes for update user and add token
2015-01-19 18:57:51 +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
f1996a9f1f
Initial work on seperation between user and account
2015-01-19 16:28:45 +01:00
Torkel Ödegaard
d8e5be5782
Worked on database agnostic table creation for db migrations
2015-01-19 10:44:16 +01:00
Torkel Ödegaard
7d70ffe201
adding more columns for account table migration
2015-01-18 20:09:30 +01:00
Torkel Ödegaard
a64a38d7dd
Added migration log and migration id, do not execute already executed migrations
2015-01-18 18:41:03 +01:00
Torkel Ödegaard
8bfed7508c
More work on sql schema and migrations, starting to get somewhere
2015-01-18 14:51:51 +01:00
Torkel Ödegaard
68a77c4051
More progress on db schema setup and migrations, tricky stuff
2015-01-18 13:08:59 +01:00
Torkel Ödegaard
1f987c1903
Began work on real sql schema definitions, and migration engine
2015-01-17 21:40:22 +01:00
Torkel Ödegaard
ed879df1f4
Corrected spelling of SignedInUser (was SignInUser)
2015-01-16 16:17:35 +01:00
Torkel Ödegaard
2b05dac071
Api Key role is now correcty added do middleware context
2015-01-16 16:15:35 +01:00
Torkel Ödegaard
3912ed5023
Role checking when saving dashboard, making sure that the user has owner or editor role
2015-01-16 15:28:44 +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
f858f6b621
Add collaborator now handles role, added macaron-contrib/binding for binding and validation
2015-01-16 11:54:19 +01:00
Torkel Ödegaard
cd5843e977
Fixed unit tests
2015-01-16 07:45:37 +01:00
Torkel Ödegaard
04bbdbad12
Worked on account update, moved collaborats to its own api url and files
2015-01-15 19:14:47 +01:00
Torkel Ödegaard
804bff55ec
Accounts admin view/get api
2015-01-15 15:54:22 +01:00
Torkel Ödegaard
fdfcc3ab2a
Admin flagged users, create a default admin user on startup if missing
2015-01-15 14:44:15 +01:00
