public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,725 Commits 655 Branches 650 Tags
10a0460dc64fde9deca216f37478300a2e67fd66
Commit Graph
1317 Commits
Author SHA1 Message Date
Marcus Efraimsson d26d8c713e Merge branch 'master' into mssql_datasource 2018-03-16 15:19:19 +01:00
Corentin Chary 3d8f1a7439 alertmanager: /Creating/Sending/ 2018-03-15 13:48:58 +01:00
Corentin Chary c8da1a46c5 alertmanager: handle resolved alerts, nodata, and execution errors 
- Resolved alerts will be sent to the AM the first time they move
  from Alerting to OK
- Errors are forwarded
- NoData is not ignored anymore
- The summary annotation is set (with the alertname)
- The image annotation is set (when available)
 2018-03-15 12:02:29 +01:00
Corentin Chary d4d2b6d7da notitfiers: avoid ShouldNotify duplication 2018-03-15 10:48:29 +01:00
Corentin Chary 777c1024c9 alertmanager: if there are no alerts to send, do nothing 2018-03-15 10:08:03 +01:00
Marcus Efraimsson d2267643ed Merge branch 'master' into mssql_datasource 2018-03-15 09:53:19 +01:00
Marcus Efraimsson ef3588c1f8 docker: mssql and mssql tests blocks with common build context 2018-03-15 09:49:53 +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
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 57d46a706c mssql datasource: additional data type tests 2018-03-13 19:54:29 +01:00
Marcus Efraimsson d4beee2bb0 Merge branch 'master' into mssql_datasource 2018-03-13 16:03:02 +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
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
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
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
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
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 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
Marcus Efraimsson f76b98d252 dashboards: change dashboard/folder permission error messages 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
Daniel Lee 3b836c9c5f Merge pull request #10996 from grafana/snapshot_permissions 
Snapshot fixes and changes to snapshot list
 2018-02-23 09:17:59 +01:00
Daniel Lee fe49182b9d snapshots: fixes cleanup of old snapshots 
Snapshot cleanup did not work due to time.Now syntax error. Added test
for it as well to catch any future errors.

Added error and debug logging so that it is possible to see any errors in the future.

Removed an unused configuration value and deprecated the remove expired snapshots
setting.
 2018-02-22 16:12:16 +01:00
Marcus Efraimsson 6751bbc17f Merge branch 'master' into docs_v5.0 2018-02-22 15:55:44 +01:00
Marcus Efraimsson 3f588b4c48 dashboards: created/updated and createdby/updatedby should be set before save 
If creating a new folder/dashboard created/updated and createdby/updatedby should always be set.
If updating an existing folder/dashboard updated and updatedby should always be set.
 2018-02-22 11:54:28 +01:00
Daniel Lee 7d9a9fa29c snapshots: change to snapshot list query 
Admins can see all snapshots. Other roles can only see their own
snapshots.

Added permission check for deleting snapshots - admins can delete
any snapshot, other roles can delete their own snapshots or
snapshots that they have access to via dashboard permissions.
 2018-02-21 13:39:08 +01:00
Marcus Efraimsson 8a8f3bd5bb folders: fix typo 2018-02-21 11:28:11 +01:00
Marcus Efraimsson 3c6bc263dc Merge branch 'master' into 10630_folder_api 2018-02-21 11:25:56 +01:00
Marcus Efraimsson 78283b9c77 folders: extend folder service tests 2018-02-21 11:25:21 +01:00
Marcus Efraimsson a167e19b37 folders: folder api tests 2018-02-21 11:24:54 +01:00
Torkel Ödegaard 2f6e77af1e Merge branch 'master' into docs_v5.0 2018-02-21 10:47:14 +01:00
Marcus Efraimsson 02278f90a7 dashboards: make fake dashboard guardian available to other packages 2018-02-20 18:08:19 +01:00
Marcus Efraimsson 268fb4dc6c folders: new folder service for managing folders 2018-02-20 13:56:22 +01:00
Marcus Efraimsson 39aba03483 dashboards: created date should be set when creating a folder/dashboard 2018-02-20 13:54:31 +01:00
Torkel Ödegaard 21d48df095 fix: plugin dashboard did not get plugin id after import 2018-02-20 11:30:18 +01:00
bergquist 4dc6074e79 provisioning: dont ignore sample yaml files 
closes #10963
 2018-02-20 08:40:37 +01:00