236 Commits

Author SHA1 Message Date
fb636344a6 feat(alerting): began work on testing alert rule from UI without having to save it 2016-07-20 16:13:36 +02:00
f13b869aa4 feat(alerting): work on alerting 2016-07-14 13:32:16 +02:00
624cd6fc0a feat(alerting): cleanup, removed alert changes table and code 2016-07-13 11:58:55 +02:00
d9096110f8 Merge branch 'master' into alerting
Conflicts:
	pkg/api/dashboard.go
	pkg/models/dashboards.go
	pkg/services/sqlstore/dashboard.go
2016-07-11 18:28:07 +02:00
d44325affd feat(apps): progress on app dashboard imports 2016-07-08 09:35:06 +02:00
a18506e2e4 feat(alerting): changing notifications should require org admin 2016-06-20 11:32:55 +02:00
0c5da9155f feat(alerting): only expose DTO info when requesting all notifications 2016-06-20 11:31:20 +02:00
96e5ad3f5c Merge branch 'alerting' into alerting_notifications 2016-06-20 10:45:05 +02:00
dd8c3d0355 Merge branch 'master' into alerting 2016-06-20 10:44:48 +02:00
9f9fca1e76 feat(datasource): added suggest urls for each data source, #4577 2016-06-17 13:35:29 +02:00
b035074613 tech(alerting): disable update state api 2016-06-16 17:02:45 +02:00
a0418da160 Merge branch 'alerting' into alerting_notifications 2016-06-16 16:49:16 +02:00
8ec311ade4 Merge branch 'master' into alerting 2016-06-16 16:29:41 +02:00
b907ce341c feat(alerting): enables deletes for alert notifications 2016-06-16 15:21:44 +02:00
7f767224af feat(alerting): basic support for creating and updating notifications 2016-06-16 14:29:20 +02:00
a3b7ea7704 feat(alerting): skeleton for alert notification configuration page 2016-06-16 08:16:16 +02:00
ec0b09450c Merge branch 'export-dashboard'
Conflicts:
	conf/defaults.ini
	pkg/setting/setting.go
	public/app/core/components/grafana_app.ts
	public/app/core/core.ts
	public/app/features/dashboard/dashboardCtrl.js
2016-06-16 08:06:43 +02:00
0667d73660 Merge branch 'new-logger' into alerting_definitions
Conflicts:
	pkg/api/api.go
	pkg/setting/setting.go
2016-06-07 13:31:56 +02:00
3dc7706c45 feat(loggin): improved http request panic handling 2016-06-07 10:05:10 +02:00
34e17f7282 feat(alerting): requests looks to be working again 2016-06-06 17:11:46 +02:00
70cb8400c3 feat(alerting): changed name of root Alerts nav item and page from Alerts to Alerting 2016-06-06 09:17:29 +02:00
f36a44c49a Merge branch 'master' into alerting_definitions
Conflicts:
	conf/defaults.ini
	pkg/api/dashboard.go
2016-06-06 08:43:01 +02:00
e0c6048820 feat(instrumentation): added gauge and http endpoint 2016-06-03 16:15:36 +02:00
1a05ae2eaa feat(instrumentation): more work 2016-06-03 15:06:57 +02:00
1686d86c3b Merge branch 'master' into alerting_definitions 2016-05-30 08:26:08 +02:00
e83d13848e Merge branch 'master' into export-dashboard
Conflicts:
	public/app/features/dashboard/submenu/submenu.ts
2016-05-26 14:22:22 +02:00
4038b4d17e Set active org through admin api (#5179) 2016-05-26 06:51:23 +02:00
ba6573af61 Merge branch 'master' into export-dashboard
Conflicts:
	public/app/features/dashboard/submenu/submenu.ts
2016-05-25 12:32:56 +02:00
8c2b6b532d fix(preferences): fixes broken default home dashboard
closes #5167
2016-05-25 09:56:45 +02:00
855e913bbd feat(dashboards): began work on dashboard list 2016-05-19 11:03:10 +02:00
1fe2055743 tech(alerting): disable DEL for alert rules in the api 2016-05-10 15:02:11 +02:00
1bb8bc58b8 feat(alerting): add parameteters for filtering alerts 2016-05-10 09:45:56 +02:00
47070f2d1f chore(alerting): struct names and url refactoring 2016-05-09 11:25:21 +02:00
27274f37e8 feat(alerting): update paths for alert state 2016-05-06 14:37:41 +02:00
bb6f4fff87 feat(export/import): minor progress 2016-05-03 16:40:21 +02:00
743a6fa37c feat(alerting): add support for deleting alert rules 2016-05-02 16:07:19 +02:00
f442adca47 feat(alerting): adds api endpoints for alerts per dashboard and panel 2016-04-28 15:13:42 +02:00
ecfbc2edca feat(alerting): adds alert history page 2016-04-28 11:42:03 +02:00
0f0fa0c257 feat(alerting): adds endpoint for getting alert states log 2016-04-28 10:59:46 +02:00
e7be7d2835 feat(alerting): add api endpoint for alert state 2016-04-28 08:23:50 +02:00
6a5ecb3fca feat(alerting): adds basic page for listing alerts 2016-04-27 13:02:28 +02:00
973db1ac38 feat(alerting): add api route for alert changes 2016-04-27 08:59:33 +02:00
9b50313f11 feat(alerting): add api endpoints for listing alerts 2016-04-26 17:36:50 +02:00
d9ad4cf2fc fix(): made plugin settings api call accessable for viewer roles 2016-04-13 13:03:41 -04:00
10131aa8a0 fix(pluginlist): fixed issue with home dashboard and new pluginlist panel that casued permission denied error for non admin users, fixes #4686 2016-04-13 12:23:29 -04:00
12800f831a Merge branch 'master' into pluginlist 2016-04-09 15:01:39 -04:00
370589d6c0 fix(org switch): fixed issue with switching orgs, fixes #4614 2016-04-09 13:27:06 -04:00
d70ef90bdd feat(): plugin list panel 2016-04-08 16:42:33 -04:00
43ebc172cb fix(profile): fixed change password link and page, fixes #4542 2016-04-04 13:52:41 -04:00
ab1048b7ee feat(preferences): theme and home dashbord settings now work work on profile and org settings page 2016-04-02 13:54:06 -07:00