c3a768b3ed
provsioning: dont stop grafana due to missing
2018-01-25 09:30:37 +01:00
d36fd66dba
dashfolder: fix for sqlite test
2018-01-24 11:43:08 +01:00
9d2a667e8b
dashfolder: fix for mysql test
2018-01-24 11:19:26 +01:00
ee973a977b
stats: send amount of stars as stats
2018-01-23 22:51:05 +01:00
ea988a37dd
tech: avoid using deprecated functions
2018-01-23 22:30:45 +01:00
5a1cf2c793
style: minor code style changes
2018-01-23 22:28:47 +01:00
97d969bd5c
Update OpsGenie Notifier to support different api domains.
2018-01-22 22:27:35 +03:00
0dffb6dbb1
Adjusted the border color on the buttons in dashboard nav, fixed alert email text area width, fixed padding-top issue on dashboard settings aside
2018-01-18 14:40:08 +01:00
d6667c4fa0
Merge pull request #10548 from StevenTobin/follow_symlinks
...
Make file_reader follow symlinks
2018-01-18 11:29:34 +01:00
f1813ae3a3
Make file_reader follow symlinks
2018-01-17 14:51:17 +00:00
34d7f8a44f
dashboards as cfg: property path replaces folder
2018-01-17 15:48:24 +01:00
183507964c
Clearer naming for dashboard provisioning config.
...
Renames folder (in options) to path to make it
different from the grafana folder wherein the
dashboard will be created.
2018-01-16 17:40:14 +01:00
1a6c2ea8d8
dashboards as cfg: logs error when trying to import dashboard with id
...
dashboard json cannot contain fixed id when importing from
disk. We used to override this but it didnt caught all problems
so now we block dashboards from beeing imported instead.
closes #10504
2018-01-15 12:26:43 +01:00
43109dc8ca
telegram: Send notifications with an inline image
...
If image upload is enabled, but there is no public image repository,
fall back to sending an image via telegram's API.
2018-01-11 17:23:50 -05:00
b6fcf2b609
telegram: Switch to using multipart form rather than JSON as a body
...
This is a pre-requisite for uploading inline images.
2018-01-11 17:21:43 -05:00
a1a9f339bf
telegram: Fix a typo in variable name
2018-01-11 17:21:43 -05:00
c42a232644
Merge branch 'react-mobx'
2018-01-04 09:12:57 +01:00
029317ed18
tech: alert list react migration progress
2017-12-31 14:16:19 +01:00
f5e00e133b
dashboards as cfg: moves dashcash into its own file
2017-12-28 13:37:02 +01:00
237d469ed4
dashboards as cfg: create dashboard folders if missing
...
closes #10259
2017-12-28 13:33:11 +01:00
f4078e1935
tests: for skipping with hidden folders
2017-12-27 15:04:49 +01:00
3e7420320c
Merge branch 'master' into react-mobx
2017-12-26 13:53:39 +01:00
7917efb31a
pagerduty: fixes invalid default value
...
autoResolve incident checkbox was set to disabled by default but
the backend used enabled as default. This commit makes both use
disabled by defualt
fixes #10222
2017-12-22 10:54:48 +01:00
e480a38dc1
pagerduty: adds test for reading auto resolve setting
2017-12-22 09:58:37 +01:00
4181602b78
react: progress on react containers and mobx-state-tree store
2017-12-21 11:56:45 +01:00
af34f9977e
Add avatar to team and team members page ( #10305 )
...
* teams: add db migration for email column in teams table
* teams: /teams should render index page with a 200 OK
* teams: additional backend functionality for team and team members
Possibility to save/update email for teams.
Possibility to retrive avatar url when searching for teams.
Possibility to retrive avatar url when searching for team members.
* teams: display team avatar and team member avatars
Possibility to save and update email for a team
* teams: create team on separate page instead of modal dialog
2017-12-20 21:20:12 +01:00
df3655dd4a
db: fix postgres regression when comparing boolean columns/values ( #10303 )
...
Use the dialect specific BooleanStr when comparing boolean columns/values.
Fixes #10300
2017-12-20 12:15:49 +01:00
e2be6a38c4
pushover: update default message
2017-12-19 14:31:26 +01:00
f36aa2e953
Merge branch 'patch-1' of https://github.com/devkid/grafana into devkid-patch-1
...
* 'patch-1' of https://github.com/devkid/grafana :
Add default message for Pushover notifications
2017-12-19 14:30:09 +01:00
644c2f7fb0
test: remove unused code
2017-12-19 11:23:21 +01:00
66cf224e31
alerting: make alert extractor backwards compatible
...
closes #10270
2017-12-19 11:20:05 +01:00
1816e89730
alerting: move test json into files
2017-12-19 10:22:26 +01:00
51ec64f872
fix: reduced team name column length, fixes #10244
2017-12-18 13:38:29 +01:00
a8a5f8181b
fix: viewers can edit now works correctly
2017-12-15 14:19:49 +01:00
c395237710
Merge branch Grafana v5 'develop' branch
2017-12-15 12:06:09 +01:00
8905c8e5fb
Merge branch 'team_member_count' of https://github.com/bergquist/grafana into develop
2017-12-15 11:53:47 +01:00
2b814738c1
dashfolder: change to migration text
...
First index for the dashboard_acl table had the word
unique in the migration description even though the
index is not unique
2017-12-15 11:35:14 +01:00
256f7176a2
teams: add team count when searching for team
...
closes #10207
2017-12-15 11:08:06 +01:00
5dbbf1826c
Avoid ID validation before provisioning dashboards
...
Attempting to provision grafana using a previously exported
JSON dashboard with the ID field already set, might result in an error.
In fact, Grafana might believe that a dashboard with that
given ID already exists in the database, throwing an error if it doesn't.
(see pkg/services/sqlstore/dashboard.go#L32)
The dashboard provisioner should set the dashboard id to zero in order to
avoid this behaviour inducing the dashboard to be written to the DB
without ID validation.
2017-12-14 02:07:50 +01:00
a7645b710d
Merge remote-tracking branch 'origin/master' into develop
2017-12-13 19:18:10 +01:00
ade734168c
alertmanager: endAt should only be used if we have the correct value
2017-12-13 19:17:00 +01:00
3691faf136
alertmanager: code style
2017-12-13 19:17:00 +01:00
1240db31d3
alerting: reduce log level for notifiers
2017-12-13 19:17:00 +01:00
a8264fe316
Alertmanager notifier: add "metric" labels if no tags
...
Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com >
2017-12-13 19:17:00 +01:00
3a7939c930
Alertmanager notifier: make it match the new notifier interface
...
Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com >
2017-12-13 19:17:00 +01:00
20d94f9703
support alertmanager
2017-12-13 19:17:00 +01:00
35106537f2
Replace Read Only Editor role with ViewersCanEdit setting ( #10166 )
...
* removes readonly editor role
* adds viewersCanEdit setting
This enable you to allow viewers to edit/inspect
dashboards in grafana in their own browser without
allowing them to save dashboards
* remove read only editor option from all dropdowns
* migrates all read only viewers to viewers
* docs: replace readOnlyEditor with viewersCanEdit
2017-12-13 18:53:42 +01:00
313735bd75
search: worked on search results
2017-12-13 15:51:59 +01:00
bf999a4f82
fixes broken alert eval when first condition is using OR
...
closes #9318
2017-12-13 13:37:10 +01:00
dd3dd407ad
removes unused property
2017-12-13 13:12:50 +01:00
bergquist
Marcus Efraimsson
Daniel Lee
bkaganyildiz
Matt
Carl Bergquist
stobin
Leonard Gram
Robin Burchell
Torkel Ödegaard
Simon Aquino
Thibault Chataigner
Mitsuhiro Tanda