Torkel Ödegaard
cbeefcd376
Merge pull request #14574 from grafana/14543_org_redirect
...
fix signed in user for orgId=0 result should return active org id
2018-12-19 11:31:06 +01:00
Torkel Ödegaard
36154e59b0
Merge pull request #14571 from oiooj/pr-ds-limit
...
Raise datasources number to 5000
2018-12-19 11:26:16 +01:00
Carl Bergquist
854487acab
Merge pull request #14441 from cinaglia/delete-external-snapshot
...
Add support for deleting external snapshots from Snapshots List
2018-12-18 22:43:12 +01:00
Marcus Efraimsson
e82b3632f6
fix signed in user for orgId=0 result should return active org id
2018-12-18 20:02:27 +01:00
Baokun Lee
f51222027d
Raise datasources number to 5000
2018-12-18 23:59:14 +08:00
bergquist
7aa84aeb61
moves migrations to /sqlstore/migrations
2018-12-17 16:36:57 +01:00
Daniel Lee
90e2175716
migration: renames logging ds to loki ds in data_source table
2018-12-12 20:54:05 +01:00
Victor Cinaglia
9d6da10e82
snapshots: Move external snapshot creation to backend
2018-12-10 16:36:32 -05:00
Victor Cinaglia
d9d6a4481f
snapshots: Add external_delete_url column
2018-12-10 16:25:02 -05:00
moznion
4397ee61d0
Put issue number to test code
2018-12-05 22:47:41 +09:00
moznion
d1e1cde00e
Fix bug what updating user quota doesn't work
...
Reason is same as 061e06c226
2018-12-05 22:29:07 +09:00
moznion
061e06c226
Fix bug what updating org quota doesn't work
...
3c330c8e4c/pkg/services/sqlstore/quota.go (L106)
2018-12-05 22:19:40 +09:00
Mario Trangoni
fadd816d89
pkg/*: Fix misspell issues
...
See,
$ find . -type f | xargs misspell -locale US | grep -vi -e vendor -e devenv -e Unknwon -e Destory | grep pkg
./pkg/services/sqlstore/org_test.go:190:15: "frome" is a misspelling of "from"
./pkg/tsdb/elasticsearch/response_parser.go:544:24: "Unkown" is a misspelling of "Unknown"
./pkg/tsdb/opentsdb/opentsdb.go:87:20: "marshalling" is a misspelling of "marshaling"
./pkg/components/dynmap/dynmap_test.go:2:7: "Licence" is a misspelling of "License"
./pkg/components/dynmap/dynmap.go:2:7: "Licence" is a misspelling of "License"
2018-12-04 23:29:34 +01:00
danielbh
d1b8f13c66
feat: #11067 prevent removing last grafana admin permissions
2018-12-03 20:05:52 -05:00
Carl Bergquist
6049855dc7
Merge pull request #13947 from bergquist/alerting_for
...
Introduce alert debouncing
2018-11-19 10:38:02 +01:00
Marcus Efraimsson
5f9fecd254
feat: team preferences
2018-11-12 20:01:53 +01:00
bergquist
2fb78a50d6
minor fixes based on code review
2018-11-12 10:50:56 +01:00
bergquist
423331dae0
alerting: delete alerts when parent folder is deleted
...
closes #13322
2018-11-05 14:25:26 +01:00
bergquist
ccd89eee97
renames debouceduration to for
2018-11-05 11:05:30 +01:00
bergquist
d25284a364
introduce state unknown for rules that have not been evaluated yet
2018-11-05 10:50:28 +01:00
bergquist
4526660cb2
wire up debounce setting in the ui
2018-11-05 10:50:28 +01:00
bergquist
2d3a575489
adds db migration for debounce_duration
2018-11-05 10:50:28 +01:00
Marcus Efraimsson
818d48c2c0
always execute the user teams query
2018-11-05 10:49:56 +01:00
Marcus Efraimsson
5be2332c66
handle error before populating cache
2018-11-05 09:58:13 +01:00
Marcus Efraimsson
6ef941ea17
fix failing tests
2018-11-02 16:03:12 +01:00
Torkel Ödegaard
93453c2d94
added caching of signed in user DB calls
2018-10-31 06:47:14 -07:00
Marcus Efraimsson
70ddf93688
include teams on signed in user
2018-10-30 09:32:32 +01:00
bergquist
0a9bfc5529
delete provisioning meta data when deleting folder
...
prior to this fix Grafana didnt delete meta data
about the provisioned dashboard in `dashboard_provisioning`
which means that the dashboard wasn't inserted into
Grafana again if the folder was delete within Grafana.
closes #13280
2018-10-24 13:32:45 +02:00
Marcus Efraimsson
da89c27caf
Merge pull request #13702 from grafana/data-source-instance-to-react
...
Support Data source permissions
2018-10-17 16:54:57 +02:00
bergquist
70385119bc
removes d in disableResolvedMessage
2018-10-17 10:41:18 +02:00
bergquist
5566a61aef
alerting: tests default value for disable resolve message
2018-10-17 09:53:03 +02:00
Dave Waters
a3137e731d
clean up tests
2018-10-16 20:39:07 -04:00
Dave Waters
0eae7b077d
fix gofmt, add test, correct noted concerns with default value
2018-10-16 17:38:59 -04:00
Dave Waters
c4dcf5a4ee
fix gofmt, add test, correct noted concerns with default value
2018-10-16 17:33:38 -04:00
Dave Waters
18c73631ea
rename UI Option, align with control, update tests
2018-10-16 07:12:32 -04:00
Peter Holmberg
ee0cc9bd77
Merge branch 'master' into data-source-instance-to-react
2018-10-16 12:14:11 +02:00
Dave Waters
6376154b16
add channel option to disable the resolved alert (OK Message) that is sent when condition returns to normal.
2018-10-15 17:16:14 -04:00
Torkel Ödegaard
d17025fb43
Merge pull request #13631 from mjtrangoni/fix-megacheck-issues
...
Fix trivial megacheck issues
2018-10-13 06:56:29 +02:00
Mario Trangoni
74533a7a19
pkg/services/sqlstore/user_auth_test.go: comment unused users slice
...
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/services/sqlstore/user_auth_test.go:28:18⚠️ this result of append is never used, except maybe in other appends (SA4010) (megacheck)
2018-10-13 02:35:03 +02:00
Torkel Ödegaard
d5d8d7efa6
minor setting refactorings
2018-10-12 07:55:36 +02:00
Torkel Ödegaard
b671b9704f
changed property name to UserWasDeleted and added an assert for it
2018-10-11 12:20:53 -07:00
Torkel Ödegaard
9585dc7825
added the UserWasRemoved flag to make api aware of what happened to return correct message to UI
2018-10-11 07:58:22 +02:00
Torkel Ödegaard
5b5cb6622d
Remove user form org now completely removes the user from the system if the user is orphaned
2018-10-11 07:48:35 +02:00
Marcus Efraimsson
4d719b0d05
Merge remote-tracking branch 'origin/master' into noop-services-poc
2018-10-08 16:02:44 +02:00
Torkel Ödegaard
6c41cfb72c
wip: made sqlstore dialect accessable from outside
2018-10-02 16:14:29 +02:00
Marcus Efraimsson
9af809ff8a
Merge pull request #13440 from grafana/reminder_refactoring
...
Transaction issues for alert reminder
2018-10-02 15:55:18 +02:00
Marcus Efraimsson
418f77e70e
get or create alert notification should use transaction
2018-10-02 15:07:44 +02:00
bergquist
7b781e4c3c
use notification state id instead of notifier id
2018-10-02 14:53:39 +02:00
bergquist
67e5f62514
move version conflict logging for mark as complete to sqlstore package
2018-10-02 14:23:18 +02:00
bergquist
9022e871e3
avoid sending full notification state to pending/complete
2018-10-02 13:57:41 +02:00
