IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,640 Commits 5,416 Branches 554 Tags
bdf6a75c9172942788e261af0904d79b5f2b061e
Commit Graph

3179 Commits

Author SHA1 Message Date
Carl Bergquist
105f6ff88c Merge pull request #11249 from bergquist/legacy_render_urls 
Avoid redirecting internal rendering requests
 2018-03-14 15:42:07 +01:00
bergquist
6cac7c2de9 renderer: avoid redirect render requests 
closes #11180
 2018-03-14 15:27:18 +01:00
Carl Bergquist
6d1e3613f7 Merge pull request #11246 from grafana/11227_import 
dashboard: fix import dashboard with alert rule(s)
 2018-03-14 14:38:29 +01:00
Carl Bergquist
a8918047a2 Merge pull request #11238 from grafana/11155-mysql-issue 
middleware: recover and retry on session start
 2018-03-14 14:29:47 +01:00
Marcus Efraimsson
87284d284e dashboard: fix import dashboard with alert rule 
Importing a dashboard with alert rule(s) should be possible without receiving invalid
alert data error. This fix reverts the import logic to how it worked before Grafana v5.0,
that is import will allow dashboard with alert rule(s) but no alerts will be created.
After an import the user will need to update the dashboard for the alerts to be created.
Fixes #11227
 2018-03-14 14:24:56 +01:00
Carl Bergquist
0ef94ea403 Merge pull request #11232 from grafana/11231_dash_url 
Should be possible to browse dashboard using only uid
 2018-03-14 14:18:58 +01:00
Daniel Lee
5f511deefc middleware: recover and retry on session start 
Partial fix for #11155 - the Macaron session middleware
panics if mysql returns an error. This fix recovers from
the panic and retries once
 2018-03-14 12:26:59 +01:00
bergquist
be7ec310b1 alerting: supports extracting alerts from collapsed panels 
collapsed rows wrap the hidden rows within itself. This caused
the extractor to miss the panel and therefore delete the alert
accosiated with the graph.

closes #11222
 2018-03-14 11:23:16 +01:00
Marcus Efraimsson
5fbfd67b94 dashboards: should be possible to browse dashboard using only uid 
That is, the slug part of url should be optional.
Closes #11231
 2018-03-13 21:06:25 +01:00
Leonard Gram
87bc60b9d7 alerting: adds back the link to grafana. 2018-03-13 13:29:57 +01:00
John Baublitz
aba6f627c5 Fix CI 2018-03-13 13:29:57 +01:00
John Baublitz
89557dd67b Modify Grafana Pagerduty notifier to use Pagerduty API V2 2018-03-13 13:29:57 +01:00
bergquist
061a418f0f style: dont expose func outside package 2018-03-13 11:24:10 +01:00
Daniel Lee
3f2c086e6f teams: removes quota on route 
Got added by mistake a year ago.
 2018-03-13 10:56:35 +01:00
Dobrosław Żybort
5a368f99ec Fix urls in plugin update_checker logs 2018-03-12 14:38:37 +01:00
Mitsuhiro Tanda
a83ede0193 support POST for query and query_range 2018-03-12 13:25:05 +09:00
Carl Bergquist
a589f701ad Merge pull request #10925 from mtanda/cw_high_resolution 
(cloudwatch) support high resolution query
 2018-03-08 18:06:08 +01:00
Carl Bergquist
5153d8e535 Merge pull request #11161 from DanCech/quota-refactor 
move quota to dedicated service
 2018-03-08 15:21:16 +01:00
Carl Bergquist
87db2d1183 Merge pull request #11130 from DanCech/context-refactor 
move Context and session out of middleware
 2018-03-08 10:21:34 +01:00
Dan Cech
bbd6adabbf move quota to dedicated service 2018-03-07 17:19:35 -05:00
Carl Bergquist
e3b86637f9 Merge pull request #11146 from grafana/go1.10 
Upgrade golang to 1.10
 2018-03-07 18:00:37 +01:00
Dan Cech
c0ecdee375 rename Context to ReqContext 2018-03-07 11:54:50 -05:00
Mitsuhiro Tanda
eecbdc89eb fix, set default highResolution setting 2018-03-08 01:18:11 +09:00
Carl Bergquist
d220516664 Merge pull request #11145 from grafana/alerting-invalid-data 
alerting: fixes validation error when saving alerts in dash
 2018-03-07 17:06:19 +01:00
Carl Bergquist
d07aff8991 Merge pull request #11127 from DanCech/oauth-jwt-email 
only use jwt token if it contains an email address
 2018-03-07 17:01:12 +01:00
bergquist
cb223ee563 removes commented code 2018-03-07 16:40:24 +01:00
bergquist
ff6108051d removes unused variables 2018-03-07 16:40:24 +01:00
Daniel Lee
d96fbb486f alerting: fixes validation error when saving alerts in dash 
If a panelId in the dashboard json is set to zero then the validation
silently fails. Instead of returning an error, it just ignores alerts and
saves the dashboard.
 2018-03-07 16:20:05 +01:00
Carl Bergquist
c39e68de24 Merge pull request #11046 from llamashoes/master 
Add metrics that triggered alert to description in OpsGenie.
 2018-03-07 15:48:30 +01:00
Carl Bergquist
3f6e525755 Merge pull request #10942 from grafana/pausing_alerts_updates_timestamp 
Pausing/un alerts now updates new_state_date
 2018-03-07 15:40:12 +01:00
Dan Cech
338655dd37 move Context and session out of middleware 2018-03-06 18:16:49 -05:00
Dan Cech
9d005c50a2 only use jwt token if it contains an email address 2018-03-06 14:21:36 -05:00
Carl Bergquist
01582a2f12 Merge pull request #11121 from grafana/telegram-inline-image-notifications 
alerting: Limits telegram captions to 200 chars.
 2018-03-06 14:19:59 +01:00
Leonard Gram
891462b5d9 alerting: Limits telegram captions to 200 chars. 
The caption for inline images in Telegram is
limited to 200 characters.

Fixes #10975
 2018-03-06 12:38:03 +01:00
bergquist
5934521137 fixes invalid link to profile pic when gravatar is disabled 
closes #11097
 2018-03-06 11:46:50 +01:00
Sven Klemm
4904a051cf use net/url to generate postgres connection url 2018-03-05 16:06:04 +01:00
Sven Klemm
4e826ff8f7 remove spaces around arguments of macros 2018-03-02 19:24:15 +01:00
Sven Klemm
f1ba9137c0 remove spaces around arguments before calling macro expansion 2018-03-02 19:20:30 +01:00
Sven Klemm
0f931f9e5e Merge remote-tracking branch 'upstream/master' into macroengine-interpolate 2018-03-01 18:01:54 +01:00
Daniel Lee
cc2f478792 Merge branch 'docs_v5.0' 2018-03-01 09:36:48 +01:00
Ryan Gifford
49266d5150 Add metrics that triggered alert to description 2018-02-28 15:26:11 -07:00
Marcus Efraimsson
3d4e99d8be Merge pull request #11040 from grafana/permission-checks 
Add permission check for dashboard diff api route
 2018-02-28 18:23:39 +01:00
Laurent Godet
59704ee939 Fix Github OAuth not working with private Organizations (#11028) 
* Fix Github OAuth not working with private organizations

* Update documentation
 2018-02-28 13:08:15 +01:00
Marcus Efraimsson
f44e476580 permissions: fix validation of permissions before update 
Did a bad pointer comparison so extended the tests for duplicate permissions.
 2018-02-28 08:48:28 +01:00
Daniel Lee
ecf438f8d0 dashboard: add permission check for diff api route 
ref #10770
 2018-02-27 17:53:30 +01:00
Marcus Efraimsson
f76b98d252 dashboards: change dashboard/folder permission error messages 2018-02-27 16:04:45 +01:00
Marcus Efraimsson
03f8eff880 dashboards: handle new guardian error responses and update tests 
Using a mocked guardian instead and relies on the actual guardian tests for verifying
permission handling correctness
 2018-02-27 16:04:45 +01:00
Marcus Efraimsson
3c14cecd50 folders: handle new guardian error responses and add tests 2018-02-27 16:04:45 +01:00
Marcus Efraimsson
955dfcc8fe dashboards: don't allow override of permissions with a lower precedence 
If a dashboard inherits permissions from a folder, don't allow same permission to be added
to the dashboard with a lower permission.
Add backend validation so that you cannot add same permission to folder/dashboard, for example
same user/team with different permissions
 2018-02-27 16:04:45 +01:00
Marcel Anacker
69006a7764 Alerting: Fix OK state doesn't show up in Microsoft Teams (#11032) 
* Alerting: Fix OK state doesn't show up in Microsoft Teams

* Fix formatting
 2018-02-27 15:48:36 +01:00