bergquist
7c0fc59dfb
execute process directly instead of creating sub shell
2017-12-13 17:58:50 +01:00
Torkel Ödegaard
313735bd75
search: worked on search results
2017-12-13 15:51:59 +01:00
bergquist
bf999a4f82
fixes broken alert eval when first condition is using OR
...
closes #9318
2017-12-13 13:37:10 +01:00
Torkel Ödegaard
ccbd18006e
ux: org user management changes
2017-12-13 13:16:44 +01:00
bergquist
dd3dd407ad
removes unused property
2017-12-13 13:12:50 +01:00
Torkel Ödegaard
22aa1f7e42
ux: change members to users
2017-12-13 11:21:33 +01:00
bergquist
0b6169b3f5
removes verbose logging
2017-12-13 10:21:11 +01:00
Torkel Ödegaard
2465fcbd6b
fix: FolderId and IsFolder when saving dashboard
2017-12-13 10:00:54 +01:00
Thibault Chataigner
fd633a1d5d
Add a per-notifier ShouldNotify()
...
This way we are able to edit notification behavior per notifier.
This would be usefull to let some notifiers send notifications,
even when the state doesn't change, or with custom condition.
Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com >
2017-12-12 17:35:54 +01:00
Torkel Ödegaard
67f1435dc7
minor fix for #10136
2017-12-12 17:18:25 +01:00
Torkel Ödegaard
05cc1f85c3
Merge branch 'refactor-user-group-to-team' of https://github.com/alexanderzobnin/grafana into user-group-to-team
2017-12-12 17:07:00 +01:00
Torkel Ödegaard
89db9cc976
fix: fixed dashboard api tests
2017-12-12 16:15:24 +01:00
Torkel Ödegaard
8a61e0967e
Merge branch 'master' into develop
2017-12-12 13:22:13 +01:00
Torkel Ödegaard
cafed8ce8f
Merge branch 'master' into develop
2017-12-12 13:19:07 +01:00
bergquist
ff1b71bc20
allow overriding dashboards from api
2017-12-12 13:18:00 +01:00
bergquist
c68e7c7283
avatar: avoid concurrent map writes
2017-12-12 11:25:47 +01:00
Carl Bergquist
ea2f65b4c3
Merge pull request #10110 from bwhaley/master
...
Fixes bug in cloudwatch regarding credentials
2017-12-12 10:16:53 +01:00
Alfred Krohmer
72e686457c
Add default message for Pushover notifications
...
If the message field is left empty for Pushover notifications, the API will return an error. This adds a default message if the message would otherwise be empty.
This fixes #8006 .
2017-12-11 22:14:38 +01:00
Alexander Zobnin
26281dd9d8
refactor: format files by gofmt
2017-12-11 19:46:05 +03:00
bergquist
411e8a16c2
backend plugins: manage plugins lifecycle with context
2017-12-11 15:05:06 +01:00
bergquist
1af4f7a1b4
backend plugins: dont swallow errors
2017-12-11 13:16:16 +01:00
bergquist
026eb9ac36
backend plugins: cleanup protobuf files
2017-12-11 13:09:10 +01:00
bergquist
7f68c2a53d
backend plugins: add more datasource params
2017-12-11 12:53:01 +01:00
Torkel Ödegaard
795d9c0362
ux: fixed navbar and sidemenu z-index issue and improved responsive rules
2017-12-11 11:42:13 +01:00
bergquist
48e7f866f6
code style
2017-12-11 11:26:36 +01:00
bergquist
55a39dd2ad
implement upstream changes
2017-12-11 11:14:03 +01:00
bergquist
a4748d82ab
Merge branch 'master' into backend_plugins
...
* master:
changelog: adds note about closing #10131
Explicitly specify default region in CloudWatch datasource (#9440 )
wait for all sub routines to finish
changelog: adds ntoe about closing #10111
postgres: change $__timeGroup macro to include "AS time" column alias (#10119 )
fixes broken test
Solves problem with Github authentication restriction by organization membership when the organization's access policy is set to "Access restricted". "Access restricted" policy should not stop user to authenticate.
2017-12-11 10:43:41 +01:00
Carl Bergquist
5d70a36ad8
Merge pull request #10150 from jomenxiao/jomenxiao/render_setting_lang
...
[render image]add encoding param
2017-12-11 10:36:38 +01:00
Carl Bergquist
a5b3f2b891
Merge pull request #10132 from bergquist/go_routine_management
...
Wait for all sub routines to finish before closing Grafana
2017-12-11 09:43:37 +01:00
Mikael Olenfalk
8e7166b5c4
Explicitly specify default region in CloudWatch datasource ( #9440 )
...
The datasource uses the default region in the query if the region
is "" in the settings. However setting the region to an empty string
is almost impossible and rendered incorrectly.
This commit introduces a special value "default" for region which
is shown in the drop down and is translated to the default region
of the data source when performing queries.
2017-12-11 09:37:27 +01:00
jomenxiao
ad2a69bff4
add encoding param
2017-12-11 16:01:17 +08:00
bergquist
f7ed24475c
wait for all sub routines to finish
...
simple solution for waiting for all go sub routines to
finish before closing Grafana. We would use errGroup
here as well but I dont like spreading context's all
over the place.
closes #10131
2017-12-11 08:53:06 +01:00
Alexander Zobnin
5d3bfee2f1
refactor: user groups to teams, rename backend files
2017-12-08 18:51:59 +03:00
Alexander Zobnin
d8612380e9
refactor: rename User Groups to Teams
2017-12-08 18:25:45 +03:00
Carl Bergquist
2408d8f09a
Merge pull request #10112 from adiletmaratov/master
...
Solves problem with Github authentication restriction by organization
2017-12-08 16:05:27 +01:00
Sven Klemm
ce809de1ed
postgres: change $__timeGroup macro to include "AS time" column alias ( #10119 )
...
* change $__timeGroup macro to include column alias
* update docs and help text for $__timeGroup macro
2017-12-08 15:14:10 +01:00
Marcus Efraimsson
b03b360414
dashfolders: Create nav model for folder page client side #10083
2017-12-08 14:08:16 +01:00
bergquist
0c5ef1453d
fixes broken test
2017-12-08 11:33:15 +01:00
bergquist
f0abe696b5
Merge branch 'master' into backend_plugins
...
* master:
improve error handling for datasources as cfg
improve sample datasource.yaml
2017-12-08 10:55:55 +01:00
bergquist
5f5cdad97a
improve error handling for datasources as cfg
2017-12-08 10:50:11 +01:00
Marcus Efraimsson
017b337f00
dashfolders: create folder page
...
Fixes #10085
2017-12-07 19:32:38 +01:00
bergquist
9edd7701b2
fixes failing tests
2017-12-07 18:05:11 +01:00
Marcus Efraimsson
2ea663df78
dashfolders: New Dashboard Folder page
...
Fixes #10083 . Permissions page is just a placeholder
for now.
2017-12-07 17:30:54 +01:00
Ben Whaley
51854ff4fa
Fix go fmt
2017-12-07 16:10:13 +00:00
bergquist
e1d4bf2607
kill plugin processes when grafana shuts down
2017-12-07 16:59:35 +01:00
bergquist
a2d47427ba
separate plugin impl and proto files
2017-12-07 16:33:36 +01:00
bergquist
0bc5bf53ce
correct comments
2017-12-07 16:33:36 +01:00
bergquist
3f5daa5e58
add hclog wrapper for grafanas logger in plugins
2017-12-07 16:33:36 +01:00
bergquist
0f6c470e03
add go-plugin deps to vendor
2017-12-07 16:33:36 +01:00
bergquist
a97360ab27
initial version of proto files
2017-12-07 16:32:17 +01:00
