Commit Graph

16713 Commits

Author SHA1 Message Date
Peter Holmberg
8ab2d8b0b9 fix mutability bug, removed unused constructor 2018-10-11 15:32:13 +02:00
Leonard Gram
d360d8cebc Requests for ds via backend blocked for users without permissions. 2018-10-11 13:52:23 +02:00
Leonard Gram
ec9ed5c830 Removes unused code. 2018-10-11 13:52:23 +02:00
Peter Holmberg
3ca9c10fe4 Merge branch 'data-source-instance-to-react' of https://github.com/grafana/grafana into data-source-instance-to-react 2018-10-10 17:05:22 +02:00
Peter Holmberg
037e9ad0bd tests 2018-10-10 17:04:48 +02:00
Leonard Gram
721dd532e4 User without permission to a datasource won't see it. 2018-10-10 15:55:16 +02:00
Peter Holmberg
707446170d Merge branch 'data-source-instance-to-react' of https://github.com/grafana/grafana into data-source-instance-to-react 2018-10-10 14:58:18 +02:00
Leonard Gram
ccfcf02e33 Refactors ds permissions to a filter. 2018-10-10 14:25:57 +02:00
Peter Holmberg
8583788119 disable permissions 2018-10-10 13:50:42 +02:00
Peter Holmberg
83480a1de6 fixing weird arrow in select 2018-10-10 13:28:48 +02:00
Peter Holmberg
f150f35112 fixing permission rows 2018-10-10 11:22:08 +02:00
Peter Holmberg
8ed5594dbc enable permissions for data source 2018-10-10 10:39:48 +02:00
Peter Holmberg
363592a97b pausing permissions list 2018-10-09 16:53:59 +02:00
Peter Holmberg
a810bed2f5 Merge branch 'data-source-instance-to-react' of https://github.com/grafana/grafana into data-source-instance-to-react 2018-10-09 16:06:04 +02:00
Peter Holmberg
d71ae7bd4d Redone with DataSourcePermissions 2018-10-09 16:05:40 +02:00
Marcus Efraimsson
17a5e32f23
remove datasource permission admin for now 2018-10-09 15:23:28 +02:00
Peter Holmberg
78b56dd528 reverted AddPermissions 2018-10-09 14:50:46 +02:00
Peter Holmberg
ac6bee621c modified AddPermissions component 2018-10-09 11:07:23 +02:00
Peter Holmberg
87793ea30d Merge branch 'data-source-instance-to-react' of https://github.com/grafana/grafana into data-source-instance-to-react 2018-10-08 16:07:15 +02:00
Peter Holmberg
b283845e4e adding permissions component 2018-10-08 16:05:37 +02:00
Marcus Efraimsson
2b812b8825
Merge branch 'noop-services-poc' into data-source-instance-to-react 2018-10-08 16:04:21 +02:00
Marcus Efraimsson
4d719b0d05
Merge remote-tracking branch 'origin/master' into noop-services-poc 2018-10-08 16:02:44 +02:00
Peter Holmberg
61cac5fd61 reverted back and using angular for settings and dashboards 2018-10-08 16:01:17 +02:00
Peter Holmberg
4ecd33c79c Fixed nav model 2018-10-08 14:09:02 +02:00
Torkel Ödegaard
ed349075a0
Merge pull request #13556 from grafana/influxdb-annotation-fix
fix for influxdb annotation issue that caused text to be shown twice
2018-10-08 09:29:21 +02:00
Torkel Ödegaard
67f5bb2c4e fix for influxdb annotation issue that caused text to be shown twice, fixes #13553 2018-10-08 09:19:48 +02:00
Torkel Ödegaard
07eba60e24
Merge pull request #13537 from grafana/new-data-source-as-separate-page
New data source as separate page
2018-10-06 20:42:13 +02:00
Torkel Ödegaard
9346ee006c
Merge pull request #13547 from ceh-forks/docs-typos
docs: fix minor typos
2018-10-06 20:40:21 +02:00
Torkel Ödegaard
b411e8eb25
Merge pull request #13548 from neufeldtech/playlist_fix
Fix text overflow on playlist search  #13464
2018-10-06 20:39:42 +02:00
Torkel Ödegaard
2e4a1f317d ux: final fixes to new datasource page 2018-10-06 19:22:16 +02:00
Jordan Neufeld
4815f92f6f Fix text overflow on playlist search #13464 2018-10-06 10:17:26 -05:00
Emil Hessman
69cf131f81 docs: fix minor typos 2018-10-06 17:09:41 +02:00
Torkel Ödegaard
3c6a6e69a6
Merge pull request #13538 from narqo/circleci-fix-gofmt-test
fix gofmt tests output
2018-10-06 08:47:58 +02:00
Daniel Lee
f4f97d2e65
Merge pull request #13543 from jodli/patch-1
Fixed typo in query editor placeholder text.
2018-10-06 00:01:03 +02:00
Torkel Ödegaard
8e2859625f ux: more minor ds setting tweaks 2018-10-05 13:13:04 -07:00
Torkel Ödegaard
4f852bb4ae ux: more minor ds setting tweaks 2018-10-05 13:09:41 -07:00
Torkel Ödegaard
2860a50065 ux: tweaks to add datasource page and datasource settings page 2018-10-05 12:55:34 -07:00
Jan-Olaf Becker
82aa0a3674
Fixed typo in query editor placeholder text. 2018-10-05 20:41:48 +02:00
David
f6d332562a
Merge pull request #13529 from grafana/davkal/13517-resize-graph
Explore: resize graph on window resize
2018-10-05 16:14:25 +02:00
Vladimir Varankin
f5e81e45cc fix gofmt tests output
Print the whole command in "Execute ..." and "... returned 1" logs.
Fix "binary operator expected" by passing quoted output from
`gofmt` to `test`.
2018-10-05 14:42:25 +02:00
Peter Holmberg
e1c77f634d Merge branch 'master' into new-data-source-as-separate-page 2018-10-05 13:15:26 +02:00
Peter Holmberg
841ca49942 removed duplicate route 2018-10-05 13:09:06 +02:00
David Kaltschmidt
64af094204 Use size-me to resize explore Graph, added types 2018-10-05 11:39:00 +02:00
Peter Holmberg
b5681e9802 algorithm to find new name if it exists 2018-10-05 11:33:41 +02:00
Torkel Ödegaard
61d64c41fc
Merge pull request #13534 from grafana/misc-react-migration-fixes
ux: misc react migration fixes and info box style improvement
2018-10-05 09:55:39 +02:00
Torkel Ödegaard
848f19a4a1 ux: misc react migration fixes and info box style improvement 2018-10-05 08:43:56 +02:00
Torkel Ödegaard
1da352822a
Merge pull request #13530 from grafana/davkal/13485-cursor-suggestions
Explore: reset typeahead on cursor move
2018-10-04 18:05:32 +02:00
David
5aa91fc1c5
Merge pull request #13528 from grafana/davkal/fix-rate-hint
Explore: fix rate hint for series with null values
2018-10-04 17:51:05 +02:00
David Kaltschmidt
a0b21db053 Explore: reset typeahead on cursor move 2018-10-04 17:25:31 +02:00
David Kaltschmidt
5cb9dc99ca Explore: resize graph on window resize 2018-10-04 16:56:54 +02:00