public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,745 Commits 655 Branches 650 Tags
346ca3fc89eb9add5bdb5300c0c8a6acd248b7f0
Commit Graph

451 Commits

Author SHA1 Message Date
bergquist dd8c3d0355 Merge branch 'master' into alerting 2016-06-20 10:44:48 +02:00
Torkel Ödegaard 305a6ae110 feat(dashboards): dashboard sharing fixes 2016-06-17 11:36:35 +02:00
Torkel Ödegaard 10daf1d63a Revert "Enable the "limit" param in /api/search" 
This reverts commit 3d77685108.
 2016-06-17 11:22:39 +02:00
bergquist c96108226c fix(alerting): use alert frequency 2016-06-17 09:55:42 +02:00
bergquist 9481fcb830 fix(alerting): use alert frequency 2016-06-17 09:54:11 +02:00
bergquist e8a324c7f5 feat(alerting): add frequency back to alert model 2016-06-17 08:27:38 +02:00
bergquist 8ec311ade4 Merge branch 'master' into alerting 2016-06-16 16:29:41 +02:00
Torkel Ödegaard 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
bergquist 779ea55ee0 style(alerting): rename executor -> handler 2016-06-15 11:49:20 +02:00
bergquist 777ca4cd7d style(alerting): rename level.level to level.value 2016-06-15 11:39:25 +02:00
Torkel Ödegaard dac8b35a1a feat(alerting): renamed scheduler to handler 2016-06-13 15:58:22 +02:00
bergquist 7f22b9eb6e tech(alerting): expression -> settings 2016-06-13 15:18:19 +02:00
bergquist 0d60b042c8 style(alerting): revemo commented code 2016-06-13 14:57:24 +02:00
bergquist ca33622698 style(alerting): rename max retries 2016-06-13 14:54:06 +02:00
bergquist 3ad90c389c style(alerting): improve naming 2016-06-13 14:01:57 +02:00
bergquist 04436c8a52 test(alerting): make sure the worst state is captured 2016-06-13 13:45:26 +02:00
bergquist 6cb4bdd6cb feat(alerting): adds a result list to alertresult 
Since one query can return multiple series we might be
interested in getting the result for each serie
 2016-06-13 11:44:47 +02:00
bergquist 1e41eb8c97 tech(alerting): remove frequency from alert model 2016-06-13 10:42:36 +02:00
bergquist 94f059838c feat(alerting): implemention duration parser 2016-06-13 10:40:46 +02:00
bergquist 2cf72715fb test(alerting): fixes broken unit tests 2016-06-13 09:33:14 +02:00
Torkel Ödegaard 9216492d55 Merge branch 'alert_handles' into alert_ui_take2 
Conflicts:
	pkg/services/alerting/commands.go
 2016-06-13 07:53:13 +02:00
bergquist 77746f277d chore(alerting): move transformers to seperate package 2016-06-13 07:46:54 +02:00
Torkel Ödegaard e3b281dbac feat(alerting): more work on alerting thresholds 2016-06-12 11:43:18 +02:00
Torkel Ödegaard 1500c0e954 feat(alerting): alert threshold handles progress 2016-06-11 22:33:02 +02:00
Torkel Ödegaard 66c2594262 feat(alerting): sql update fixes 2016-06-11 14:08:55 +02:00
Torkel Ödegaard 71c1c0ab65 feat(alerting): trying to get things to work with new model 2016-06-11 13:49:11 +02:00
Torkel Ödegaard 0ef6801117 Merge branch 'master' into alert_ui_take2 2016-06-11 12:17:14 +02:00
Torkel Ödegaard 77a5e3f14d feat(alerting): minor fixes 2016-06-11 11:54:46 +02:00
Torkel Ödegaard 086b59483e feat(loggin): disable logging by default so unit tests are not full of logging 2016-06-11 11:38:25 +02:00
Torkel Ödegaard 382f396247 feat(alerting): more model changes 2016-06-11 10:54:24 +02:00
Torkel Ödegaard a362984c57 feat(alerting): renamed AlertRuleModel to just Alert, think making a distinction between an Alert and an Alert Rule is just confusing and was a mistake on my part 2016-06-11 10:26:48 +02:00
Torkel Ödegaard 2b4a9954b1 feat(alerting): progress on alerting UI and model, refactoring of dashboard parser and tests into extractor component, moved tests from sqlstore to alerting package 2016-06-11 10:13:33 +02:00
bergquist 1fa9ae810b test(alerting): enable disabled tests 2016-06-10 15:49:23 +02:00
bergquist 83c422e6ef feat(alerting): implement transform objects 2016-06-10 15:31:17 +02:00
bergquist ea8fb66f73 test(alerting): fixes broken unittests 2016-06-10 13:47:54 +02:00
bergquist 8cd1d17916 feat(alerting): new alerting model\ 2016-06-10 13:15:16 +02:00
bergquist 0c69c5afb1 test(alerting): fixes broken unittests 2016-06-10 11:37:03 +02:00
bergquist ef35184a80 feat(alerting): rename alertrule model to alertruleDAO 2016-06-10 10:00:00 +02:00
bergquist fdf051ad5a feat(alerting): begin alert rule storage refactoring 2016-06-09 22:21:28 +02:00
bergquist 1e4761854e Merge branch 'alerting_definitions' into alert_ui_take2 2016-06-09 13:03:40 +02:00
bergquist 66d47a9303 tech(alerting): go vet fix 2016-06-09 10:49:25 +02:00
Torkel Ödegaard dee5f582d7 Merge branch 'master' into alerting_definitions 2016-06-09 10:45:16 +02:00
bergquist 544073b7e1 feat(alerting): make sure saved alerts are valid 2016-06-09 10:27:23 +02:00
bergquist a1f97e0b77 feat(alerting): add heartbeat writer 2016-06-09 10:00:34 +02:00
Torkel Ödegaard a66027830b Merge branch 'alerting_definitions' of github.com:grafana/grafana into alerting_definitions 2016-06-08 09:42:31 +02:00
Torkel Ödegaard 26d93d7130 Merge branch 'master' into alerting_definitions 2016-06-08 09:36:50 +02:00
Carl Bergquist fe5673134f Merge pull request #5292 from Thib17/master 
Enable the "limit" param in /api/search
 2016-06-08 09:19:58 +02:00
bergquist 366fb11416 style(alerting): add fmt fixes 2016-06-08 08:50:11 +02:00
Torkel Ödegaard b25cb60259 Merge branch 'new-logger' 
Conflicts:
	CHANGELOG.md
 2016-06-08 08:09:59 +02:00
Zdenek Styblik 5eceabf810 fix(): Check Organization exists before User is added (#5302) 
Commit adds a check whether Organization exists before User is added to
the organization.

Fixes #3151.
 2016-06-08 05:46:21 +02:00