Commit Graph

16611 Commits

Author SHA1 Message Date
Torkel Ödegaard
31d4cf9aff
Merge pull request #13514 from grafana/13441-center-search-item
centered dashboard icon in search with flexbox
2018-10-03 20:03:41 +02:00
bergquist
81824370db bump master version to 5.4.0-pre1 2018-10-03 17:38:52 +02:00
bergquist
4498d75b17 provisioning: adds more logging about failed to deletion of provisioned dashboards 2018-10-03 17:38:10 +02:00
bergquist
75ed71a455 changelog: set date for 5.3.0-beta3 release 2018-10-03 16:48:07 +02:00
bergquist
96a0c9c56d build: fix for invalid pathing for release publisher 2018-10-03 16:47:37 +02:00
bergquist
00b4c175c6 changlog: adds note about closing #13551 and #13507 2018-10-03 16:30:26 +02:00
Daniel Lee
d6ba90815d
Merge pull request #13511 from grafana/stackdriver-nginject-fix
stackdriver: adds missing nginject attribute
2018-10-03 15:09:26 +02:00
Torkel Ödegaard
a83f0e9ba2 test: updated react snapshot 2018-10-03 14:58:34 +02:00
Torkel Ödegaard
81c44eb312 Merge branch 'revert-13502-revert-13488-org-users-to-react' 2018-10-03 14:52:50 +02:00
Torkel Ödegaard
9b4dd31095 ux: minor tweak to link 2018-10-03 14:52:13 +02:00
Daniel Lee
6d8a3ce1a3 stackdriver: adds missing nginject attribute 2018-10-03 14:42:41 +02:00
Carl Bergquist
f35fd0c5a3
Merge pull request #13509 from grafana/13507-permissions-on-role-fix
Fix issue with updating role permissions #13507
2018-10-03 14:20:12 +02:00
Carl Bergquist
99f2342fa1
Merge pull request #13508 from grafana/release_publisher
build: automatically publish releases to grafana.com.
2018-10-03 14:10:17 +02:00
Johannes Schill
97802f30ae Fix issue with updating role permissions #13507 2018-10-03 13:37:00 +02:00
Peter Holmberg
ef5180bae0 fixed toggle buttons 2018-10-03 13:04:31 +02:00
Patrick O'Carroll
9c889f8d68 centered dashboard icon in search with flexbox 2018-10-03 11:42:18 +02:00
bergquist
add6cee742 build: automatically publish releases to grafana.com. 2018-10-03 11:17:46 +02:00
Peter Holmberg
45113e6c8b updated after pr feedback 2018-10-03 10:54:15 +02:00
Torkel Ödegaard
afdec3d1b0
Revert "Revert "Org users to react"" 2018-10-03 09:43:10 +02:00
Torkel Ödegaard
d59c86ccbb
Merge pull request #13502 from grafana/revert-13488-org-users-to-react
Revert "Org users to react"
2018-10-03 09:43:05 +02:00
Torkel Ödegaard
fe4f2f71c3
Revert "Org users to react" 2018-10-03 09:40:37 +02:00
Torkel Ödegaard
38637f056f
Merge pull request #13488 from grafana/org-users-to-react
Org users to react
2018-10-03 09:30:08 +02:00
Torkel Ödegaard
c3a8dd28d5
Merge pull request #13500 from grafana/testdata-tables
Testdata tables
2018-10-03 08:54:08 +02:00
Torkel Ödegaard
ed0c2296b6 added slow queries scenario to test data source, added new panel test dashboard with slow queries 2018-10-02 13:00:54 -07:00
Torkel Ödegaard
4a77a62949
Merge pull request #13499 from dadosch/patch-1
Update configuration doc to include socket at [server]
2018-10-02 21:38:08 +02:00
dadosch
2500fe27f1
Fix "appropriate"-typo 2018-10-02 19:20:48 +00:00
dadosch
b138ae9d4c
Update configuration doc to include socket@server
`protocol=socket` and `socket=` path in [server]

fixes https://github.com/grafana/grafana/issues/8701
2018-10-02 18:59:55 +00:00
Torkel Ödegaard
9e72588cec wip: began work on support for testdata tables & annotations support 2018-10-02 18:50:30 +02:00
bergquist
1935497813 changelog: adds note about closing #13492 2018-10-02 16:38:13 +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
David
321c09aec4
Merge pull request #13416 from grafana/davkal/11999-explore-from-mixed-panels
Explore: jump to explore from panels with mixed datasources
2018-10-02 15:42:43 +02:00
Marcus Efraimsson
0e0901874b
better comment about state changes 2018-10-02 15:11:33 +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
9289cba625 merges defaultShouldNotify and ShouldNotify 2018-10-02 14:28:48 +02:00
bergquist
67e5f62514 move version conflict logging for mark as complete to sqlstore package 2018-10-02 14:23:18 +02:00
bergquist
9d3659d30d improve local variable name 2018-10-02 14:04:50 +02:00
bergquist
b45a1bd45c avoid exporting notificationState and notificationStateSlice 2018-10-02 14:03:30 +02:00
bergquist
9022e871e3 avoid sending full notification state to pending/complete 2018-10-02 13:57:41 +02:00
Peter Holmberg
908bf8e834 deleting obsolete things 2018-10-02 13:53:11 +02:00
Peter Holmberg
cc57995070 snap 2018-10-02 13:30:09 +02:00
Peter Holmberg
6d6416c04d fix after merge from master 2018-10-02 13:19:11 +02:00
bergquist
341d8af637 rename GetNotificationStateQuery to GetOrCreateNotificationStateQuery 2018-10-02 11:23:40 +02:00
bergquist
7f1d7cefc0 reminder: uses UpdatedAt to track state changes. 2018-10-02 11:19:09 +02:00
Peter Holmberg
09b681326e Merge branch 'master' into org-users-to-react 2018-10-02 11:18:01 +02:00
Peter Holmberg
cc1e22925f snaps 2018-10-02 11:11:36 +02:00
Peter Holmberg
a188ceacbc invitees 2018-10-02 11:04:55 +02:00
Carl Bergquist
9e09b2b969
Merge pull request #13477 from grafana/alert_rule_state_changes_version
use alert state changes counter for alert notification dedupping.
2018-10-02 10:18:27 +02:00
Torkel Ödegaard
f37a60dcd5 Merge branch 'data-sources-list-to-react' 2018-10-02 09:33:58 +02:00
Torkel Ödegaard
8fd1d8a057 changed from RFC to PureComponent 2018-10-02 09:27:02 +02:00