bergquist
|
1a062c52fa
|
fix(notifications): handle none configured image uploader
ref #6152
|
2016-09-29 14:31:19 +02:00 |
|
Torkel Ödegaard
|
75311e0626
|
feat(alerting): removed old init package
|
2016-09-28 21:27:24 +02:00 |
|
Torkel Ödegaard
|
5f5bbfbda5
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-09-28 21:12:37 +02:00 |
|
Torkel Ödegaard
|
80eb82420e
|
fix(cleanup): check if images dir exists
|
2016-09-28 21:12:25 +02:00 |
|
Torkel Ödegaard
|
c28d004731
|
Merge branch 'go_routines'
|
2016-09-28 21:06:07 +02:00 |
|
Torkel Ödegaard
|
71e2c6f6ef
|
refactor(backend): refactoring management of go routines in backend
|
2016-09-28 21:06:00 +02:00 |
|
Dan Cech
|
6d7061dcaf
|
fix typo in config loader
|
2016-09-28 13:10:31 -04:00 |
|
Torkel Ödegaard
|
2750c8a801
|
feat(config): changed name of allow_user_login_pass to disable_login_form, changed the section of the config option to [auth], impacts merged PR #5423
|
2016-09-28 15:27:08 +02:00 |
|
Torkel Ödegaard
|
3e657357e5
|
Merge branch 'gnet-oauth'
|
2016-09-28 15:11:03 +02:00 |
|
Torkel Ödegaard
|
e5fc4332cd
|
feat(oauth): refactoring PR #6077
|
2016-09-28 15:10:50 +02:00 |
|
bergquist
|
bc634f20d5
|
Merge branch 'master' into go_routines
|
2016-09-28 13:58:14 +02:00 |
|
bergquist
|
7a6501640f
|
tech(log): fixes extra param logging
|
2016-09-28 13:57:19 +02:00 |
|
bergquist
|
991539e410
|
style(go_routines): improve variable naming
|
2016-09-28 13:35:24 +02:00 |
|
Torkel Ödegaard
|
5ccdbf01fd
|
merge with master
|
2016-09-28 13:02:15 +02:00 |
|
Torkel Ödegaard
|
a4648607bb
|
feat(testdata): added csv test data scenario
|
2016-09-28 10:37:30 +02:00 |
|
Torkel Ödegaard
|
8d5857661e
|
refactor(tsdb): changed tsdb time series model to use null.Float instead of pointers
|
2016-09-28 09:15:48 +02:00 |
|
Torkel Ödegaard
|
63caedb094
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-09-28 08:09:51 +02:00 |
|
Torkel Ödegaard
|
460160cfa4
|
feat(testdata): added test case for ms resolution data
|
2016-09-28 08:08:46 +02:00 |
|
Torkel Ödegaard
|
22e8885690
|
feat(testdata): progress on test data stuff
|
2016-09-27 18:36:00 +02:00 |
|
Torkel Ödegaard
|
3ecd96e682
|
feat(testdata): lots of work on new test data data source and scenarios
|
2016-09-27 18:17:39 +02:00 |
|
bergquist
|
34b31aeef8
|
tech(goroutines): sync state between different go routines
|
2016-09-27 16:47:17 +02:00 |
|
bergquist
|
8e89173095
|
tech(log): fixes extra param logging
|
2016-09-27 16:06:06 +02:00 |
|
Torkel Ödegaard
|
ade8aa5b92
|
feat(graph): refactorings
|
2016-09-27 14:47:04 +02:00 |
|
Torkel Ödegaard
|
34f15d92d0
|
feat(testdata): worked on testdata app
|
2016-09-27 14:39:51 +02:00 |
|
bergquist
|
262e7193a3
|
feat(alerting): keep proccessing results even if one response panics
|
2016-09-27 11:16:55 +02:00 |
|
bergquist
|
071f2205e1
|
tech(tsdb): ops <o>
|
2016-09-27 11:13:13 +02:00 |
|
bergquist
|
46d4f817e3
|
tech(graphite): return error if statuscode is not ok
|
2016-09-27 10:09:56 +02:00 |
|
bergquist
|
dbb7852f21
|
feat: purge old files and snapshots
closes #4087
closes #2172
|
2016-09-26 14:33:40 +02:00 |
|
bergquist
|
1a32ab64b6
|
tech(renderer): improve renderOpts names
|
2016-09-26 11:07:36 +02:00 |
|
bergquist
|
effd2098ee
|
feat(alerting): fixes broken image renderer
|
2016-09-26 10:51:45 +02:00 |
|
bergquist
|
887e236bce
|
fix(rule): fixes rule reading bug
|
2016-09-26 10:01:33 +02:00 |
|
bergquist
|
8cd9225eb6
|
feat(alerting): increase timeout to 15s
|
2016-09-26 08:45:55 +02:00 |
|
Dan Cech
|
501e67a657
|
use semver when comparing grafana and plugin versions (#6108)
|
2016-09-23 14:38:59 +02:00 |
|
Torkel Ödegaard
|
9a94072c1d
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-09-23 12:30:20 +02:00 |
|
Torkel Ödegaard
|
175c651e65
|
fix(server side rendering): Fixed issues with server side rendering for alerting & for auth proxy scenarios, fixes #6115, fixes #5906
|
2016-09-23 12:29:53 +02:00 |
|
bergquist
|
99c77e7df8
|
tech(plugins): increase timeout
|
2016-09-23 09:56:42 +02:00 |
|
bergquist
|
e5c64732f1
|
fix(sql): Add boolstr to all dialects
closes #6116
|
2016-09-23 09:36:15 +02:00 |
|
Carl Bergquist
|
696a5f6a80
|
Merge pull request #6113 from replay/fix_context_dependency
Fix context dependency
|
2016-09-23 06:43:32 +02:00 |
|
Mauro Stettler
|
cb0f19f8d4
|
fix context dependency
|
2016-09-22 21:13:08 +01:00 |
|
Carl Bergquist
|
7bfef0ced8
|
Merge pull request #6111 from grafana/pluginreadme
allow non-admin users to view plugin readme
|
2016-09-22 21:12:44 +01:00 |
|
Mauro Stettler
|
b063cf0a6e
|
fix typo
|
2016-09-22 20:44:57 +01:00 |
|
Carl Bergquist
|
d6a0ec85c4
|
Merge pull request #6111 from grafana/pluginreadme
allow non-admin users to view plugin readme
|
2016-09-22 19:51:47 +02:00 |
|
Dan Cech
|
2c3dd84ebb
|
allow non-admin users to view plugin readme
|
2016-09-22 13:46:11 -04:00 |
|
bergquist
|
d711c0ed35
|
Merge branch 'master' into alert_prometheus
|
2016-09-22 19:27:24 +02:00 |
|
bergquist
|
a49c21df3a
|
fix(png-renderer): increase timeouts
|
2016-09-22 19:24:18 +02:00 |
|
bergquist
|
76b8cff445
|
fix(gnet): remove trailing ,
|
2016-09-22 16:17:22 +02:00 |
|
Torkel Ödegaard
|
f79600b352
|
fix(internal metrics): removed local dev code
|
2016-09-22 11:54:47 +02:00 |
|
Torkel Ödegaard
|
e336fb3d60
|
fix(smtp mailer): added timeout of 10 seconds to smpt mailer, fixes #2989
|
2016-09-22 11:51:39 +02:00 |
|
Torkel Ödegaard
|
936146768f
|
fix(snapshots): fixed issue with viewing embedded/solo/png panel from snapshot without login, fixes #3769
|
2016-09-22 11:46:58 +02:00 |
|
Torkel Ödegaard
|
6574dfacfb
|
feat(internal metrics): added some total stats to metrics reporting, closes #5865
|
2016-09-22 11:16:19 +02:00 |
|
Torkel Ödegaard
|
39af588a94
|
fix(playlist): fixed sorting issue with playlist playback, fixes #5467
|
2016-09-22 10:06:03 +02:00 |
|
Torkel Ödegaard
|
6257ae094c
|
feat(sqlstore): added index for dashboard_id in dashboard_tag table, fixes #5868
|
2016-09-21 21:32:51 +02:00 |
|
Dan Cech
|
b387c1291d
|
Merge branch 'master' into gnet-oauth
Conflicts:
pkg/api/login_oauth.go
|
2016-09-21 09:39:35 -04:00 |
|
Torkel Ödegaard
|
b4111d78e1
|
fix(security): fixed login issue that was a potential for social engineering, fixes #6014
|
2016-09-21 15:03:14 +02:00 |
|
bergquist
|
b856d7e193
|
fix(prometheus): remove timerange from context
|
2016-09-21 13:55:42 +02:00 |
|
bergquist
|
ae7345b04d
|
style(prometheus): remove commented test
|
2016-09-21 13:46:26 +02:00 |
|
bergquist
|
c084145cba
|
refactor(prometheus): add timerange to alert context
|
2016-09-21 13:46:10 +02:00 |
|
bergquist
|
af551b8825
|
refactor(tsdb): remove toUnix from timerange
|
2016-09-21 13:41:25 +02:00 |
|
bergquist
|
9534a04d3d
|
fix(prometheus): only accept matrix result
|
2016-09-21 13:30:41 +02:00 |
|
bergquist
|
ee0f1a0f36
|
feat(prometheus): handle more errors
|
2016-09-21 13:17:36 +02:00 |
|
bergquist
|
3e73be8d2e
|
feat(prometheus): improve error handling
|
2016-09-21 11:31:56 +02:00 |
|
bergquist
|
4c88db3e43
|
feat(prometheus): add support for legend formatting
|
2016-09-21 11:17:29 +02:00 |
|
bergquist
|
43d8bd5a25
|
feat(prometheus): initial support for prometheus
|
2016-09-21 07:01:53 +02:00 |
|
Dan Cech
|
630a8ed8aa
|
support setting default org role when adding user via grafana.net auth
|
2016-09-20 12:36:36 -04:00 |
|
Dan Cech
|
da95a23080
|
remove 'Github' from oauth login error messages
|
2016-09-20 11:36:13 -04:00 |
|
bergquist
|
d2fb660557
|
fix(cli): remove unused logging
|
2016-09-20 10:10:27 +02:00 |
|
Dan Cech
|
f5e2d61aef
|
Merge branch 'master' into gnet-oauth
|
2016-09-19 16:48:40 -04:00 |
|
Dan Cech
|
fc17ed351c
|
support logging in with grafana.net credentials
|
2016-09-19 16:48:07 -04:00 |
|
bergquist
|
3f00834f25
|
tech: remove unused dependencies
|
2016-09-19 15:21:53 +02:00 |
|
bergquist
|
77783c02cd
|
fix(alerting): dont log null series
closes #6025
|
2016-09-16 14:59:54 +02:00 |
|
bergquist
|
3c92f78ee7
|
feat(cli): add grafana version header to all request against grafana.net
|
2016-09-15 16:01:06 +02:00 |
|
bergquist
|
3c966caa23
|
feat(cli): download all plugin dependencies
|
2016-09-15 14:38:11 +02:00 |
|
bergquist
|
6be48269e2
|
tech(build): update build docs
|
2016-09-15 13:09:33 +02:00 |
|
bergquist
|
4e567b5f02
|
feat(alert): order alerts by name.. instead of nothing.
|
2016-09-14 14:51:31 +02:00 |
|
bergquist
|
a23b7f1371
|
fix(alerting): add missing evaldata field to set state command
|
2016-09-14 14:35:05 +02:00 |
|
bergquist
|
9dd8b3b408
|
wip
|
2016-09-14 14:12:19 +02:00 |
|
bergquist
|
d0f9623037
|
feat(alertlistpanel): support state filter
ref #5981
|
2016-09-14 10:49:05 +02:00 |
|
Torkel Ödegaard
|
f5809c0209
|
fix(build): trying to fix build
|
2016-09-13 20:14:18 +02:00 |
|
Torkel Ödegaard
|
9cd517780f
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-09-13 16:25:48 +02:00 |
|
Torkel Ödegaard
|
8c30babdf1
|
feat(alerting): fixed build issues
|
2016-09-13 16:24:00 +02:00 |
|
Torkel Ödegaard
|
3af891d023
|
feat(alerting): restored alert history
|
2016-09-13 16:13:41 +02:00 |
|
Torkel Ödegaard
|
b0c7e61ef8
|
feat(alerting): removed severity
|
2016-09-13 15:09:55 +02:00 |
|
wvl
|
a73424d6af
|
Secure Elasticsearch datasources a bit (#6031)
Instead of allowing users to access the
entire cluster, apply some sane restrictions.
Change-Id: Ib2e93722bf2e39d700d4afa713ff49ec556f2fdf
|
2016-09-13 15:04:21 +02:00 |
|
Torkel Ödegaard
|
6375418d8c
|
Merge branch 'alerting' into grafana-annotations
|
2016-09-13 09:38:12 +02:00 |
|
Mitsuhiro Tanda
|
1264a1b3a6
|
(cloudwatch) add metrics/dimensions (#6020)
|
2016-09-13 09:08:33 +02:00 |
|
Carl Bergquist
|
52dc2db769
|
Merge pull request #6008 from rubycut/patch-1
Increase datasource limit to 1000 #3910
|
2016-09-13 08:38:07 +02:00 |
|
Carl Bergquist
|
1c7b76cb43
|
Merge pull request #6013 from mtanda/cloudwatch_kinesis_analytics
(cloudwatch) add metrics/dimensions
|
2016-09-12 17:03:25 +02:00 |
|
Mitsuhiro Tanda
|
f998b86ade
|
(cloudwatch) add metrics/dimensions
|
2016-09-12 23:47:31 +09:00 |
|
bergquist
|
157ab1ba36
|
fix(setting): broken code
|
2016-09-12 14:57:37 +02:00 |
|
bergquist
|
d7bf70a77b
|
tech(tsdb): remove skip ssl setting. should be based on datasource settings
|
2016-09-12 13:37:00 +02:00 |
|
bergquist
|
6c5860d3e8
|
feat(metrics): measure proxy requests
|
2016-09-12 13:29:31 +02:00 |
|
Rubycut
|
501f89e829
|
Increase datasource limit to 1000 #3910
|
2016-09-12 10:45:17 +02:00 |
|
bergquist
|
eb673fd16d
|
fix(middleware): typo
|
2016-09-12 10:11:55 +02:00 |
|
Chen Chenglong
|
7b1c374f64
|
support connect ldap server with starttls (#5969)
* support connect ldap server with starttls
* add more doc for start_tls option
|
2016-09-10 09:40:56 +02:00 |
|
bergquist
|
4edb31723c
|
fix(metrics): ignore datasource proxy requests
|
2016-09-09 13:53:50 +02:00 |
|
bergquist
|
e7b56c6389
|
tech(metrics): move all request counters into one middleware
|
2016-09-09 13:28:19 +02:00 |
|
Torkel Ödegaard
|
4a2f2fba73
|
feat(alerting): show panel specific alert annotations, #5694
|
2016-09-09 11:30:55 +02:00 |
|
bergquist
|
583790e650
|
fix(alering): the crocdile turned on me > <
closes #5855
|
2016-09-09 07:42:07 +02:00 |
|
bergquist
|
aa80b52c07
|
feat(alerting): make it possible to skip ssl verification for alerting https requests
|
2016-09-08 16:29:31 +02:00 |
|
bergquist
|
7b9099ef93
|
fix(query): requires all that all series are empty to set NoDataFound
|
2016-09-08 14:33:10 +02:00 |
|
bergquist
|
9511f89a22
|
fix(alerting): fixes bug in query conditions
|
2016-09-08 13:28:41 +02:00 |
|
Torkel Ödegaard
|
23de094a81
|
feat(alerting/annotations): fixed broken test
|
2016-09-08 13:22:30 +02:00 |
|
bergquist
|
bec099cd84
|
tech: remove unused files
|
2016-09-08 11:41:56 +02:00 |
|
Torkel Ödegaard
|
b8081b29fd
|
Merge branch 'master' into grafana-annotations
|
2016-09-08 11:26:55 +02:00 |
|
Torkel Ödegaard
|
d60bd77658
|
feat(annotations): added support to show grafana stored annotations in graphs, #5982
|
2016-09-08 11:25:45 +02:00 |
|
bergquist
|
3c9432b7e9
|
fix(metrics): default updateSince to ms
|
2016-09-08 10:48:11 +02:00 |
|
bergquist
|
acf74cdacc
|
fix(alerting): change execution time to ms
|
2016-09-08 10:45:10 +02:00 |
|
bergquist
|
592ae5a39a
|
tests(alerting): fixes broken tests. pointers and stuff 🤷
|
2016-09-07 17:05:41 +02:00 |
|
bergquist
|
c769148701
|
Merge branch 'emails'
|
2016-09-07 13:52:16 +02:00 |
|
bergquist
|
59cb51dc6f
|
test(emails): update fake data model
|
2016-09-07 13:47:57 +02:00 |
|
bergquist
|
712061ab4f
|
test(alerting): fixes broken unit tests
|
2016-09-07 11:45:38 +02:00 |
|
bergquist
|
374016b9b5
|
Merge branch 'kfitzpatrick-custom-github-style-oauth'
|
2016-09-07 11:07:30 +02:00 |
|
bergquist
|
53dddf1a8f
|
fix(oauth): remove github refs from generic auth
|
2016-09-07 10:55:46 +02:00 |
|
bergquist
|
3b6820ef03
|
feat(oauth): create struct for generic oauth and add config values
|
2016-09-07 10:34:56 +02:00 |
|
Torkel Ödegaard
|
0d083bad14
|
Merge branch 'master' of github.com:grafana/grafana
Conflicts:
pkg/components/imguploader/s3uploader.go
|
2016-09-07 10:14:36 +02:00 |
|
Torkel Ödegaard
|
50b41130ca
|
feat(alerting): fixed s3 upload issue, progress on alerting on null/missing data, updated ini package to get the support for line continuations
|
2016-09-07 10:11:00 +02:00 |
|
bergquist
|
d1a7a23c84
|
test(imageupload): add more specific tests
torkels commit will fix this unit test :)
|
2016-09-07 10:05:01 +02:00 |
|
bergquist
|
4646723cbb
|
Merge branch 'custom-github-style-oauth' of https://github.com/kfitzpatrick/grafana into kfitzpatrick-custom-github-style-oauth
|
2016-09-07 08:15:44 +02:00 |
|
Torkel Ödegaard
|
fc8f0721cd
|
Merge branch 'master' of github.com:grafana/grafana
Conflicts:
pkg/services/alerting/eval_context.go
|
2016-09-06 20:40:49 +02:00 |
|
Torkel Ödegaard
|
fbae6abb3c
|
feat(alerting): progress on handling no data in alert query, #5860
|
2016-09-06 20:40:12 +02:00 |
|
bergquist
|
04690ca920
|
feat(alerting): add support for retries
ref #5855
|
2016-09-06 15:09:49 +02:00 |
|
bergquist
|
0d7a871223
|
style(alerting): remove blank lines
|
2016-09-06 14:57:15 +02:00 |
|
bergquist
|
55b560a4a8
|
feat(alerting): filter notifications based on severity
closes #5851
|
2016-09-06 14:27:48 +02:00 |
|
bergquist
|
2ca7284a56
|
tech(notifications): splitt into 3 queries
closes #5883
|
2016-09-06 08:43:15 +02:00 |
|
bergquist
|
c893e5d241
|
feat(notifications): add support for default notifications
ref #5883
|
2016-09-05 21:35:37 +02:00 |
|
bergquist
|
eb0396ad95
|
chore(tsdb): remove some logging
|
2016-09-05 21:35:24 +02:00 |
|
bergquist
|
d11bc57c37
|
feat(notifications): make it possible to send test alert notifications
closes #5847
|
2016-09-05 14:45:15 +02:00 |
|
Torkel Ödegaard
|
4c5461d4ba
|
feat(alerting): alerting scheduling distribution, only distibutes it on seconds for now, not sub second distribution, #5854
|
2016-09-05 14:26:08 +02:00 |
|
bergquist
|
1955defc43
|
fix(api): add missing jsonData field to dto
The field is available on the dto so I guess is should be used.
Otherwise we should remove the field rather then not setting it.
ref #5944
|
2016-09-01 17:21:13 +02:00 |
|
bergquist
|
86aea89214
|
style(tsdb): extract some methods
|
2016-09-01 13:03:15 +02:00 |
|
bergquist
|
d73547c0dc
|
feat(tsdb): add missing content type and join url using path
|
2016-09-01 11:12:35 +02:00 |
|
bergquist
|
3d3365f242
|
tech(graphite): add more logging
|
2016-09-01 10:09:13 +02:00 |
|
bergquist
|
94389a3a44
|
tech(tsdb): improve logging for graphite client
|
2016-09-01 09:38:43 +02:00 |
|
bergquist
|
29b60329cc
|
stupid stupid stupid me
|
2016-09-01 09:17:57 +02:00 |
|
bergquist
|
7ddd625e9d
|
feat(alerting): add slack/email support for execution errors
|
2016-08-31 15:55:01 +02:00 |
|
bergquist
|
4619a05f43
|
feat(alerting): save execution error message to annotations
|
2016-08-31 14:06:54 +02:00 |
|
bergquist
|
c624f3d470
|
fix(alerting): measure state result instead of severity
|
2016-08-31 11:55:35 +02:00 |
|
bergquist
|
645293e590
|
fix(cli): improve error message for upgrade-all
closes #5885
|
2016-08-30 13:47:42 +02:00 |
|
bergquist
|
11a4ff0f8a
|
feat(alerting): add basic UI for history in alert tab
ref #5850
|
2016-08-30 13:22:59 +02:00 |
|
bergquist
|
650a87dc05
|
feat(alerting): add alert history api endpoint
ref #5850
|
2016-08-30 09:32:56 +02:00 |
|
Carl Bergquist
|
7d4cc098a8
|
Merge pull request #5924 from cmartin0077/master
feat(api) HEAD response, fixes #3854
|
2016-08-29 15:54:21 +02:00 |
|
bergquist
|
c0697b99d6
|
fix(alerting): adds support for basic auth
closes #5897
|
2016-08-29 15:50:11 +02:00 |
|
chrismartin0077
|
0050707134
|
feat(api) HEAD response, fixes #3854
|
2016-08-29 06:07:44 -07:00 |
|
paulroche
|
5ba6bab237
|
redact provider_config (#5915)
|
2016-08-27 09:50:35 +02:00 |
|
bergquist
|
d0ca4ca3cd
|
chore(alerting): remove unused files
|
2016-08-22 17:01:23 +02:00 |
|
bergquist
|
0cbedb4473
|
chore(api): remove commented endpoints
|
2016-08-22 16:56:28 +02:00 |
|
bergquist
|
7095a9d7e1
|
Merge branch 'master' into alerting
|
2016-08-22 15:31:33 +02:00 |
|
bergquist
|
3b8bba3e9f
|
feat(alerting): add more fields to webhook
|
2016-08-22 15:11:27 +02:00 |
|
Carl Bergquist
|
90388710af
|
Merge pull request #5874 from mtanda/cw_api_gateway
(cloudwatch) add api gateway metrics/dimensions
|
2016-08-22 14:36:40 +02:00 |
|
bergquist
|
77f9c24050
|
feat(alerting): add support for count reducer
|
2016-08-22 13:25:31 +02:00 |
|
bergquist
|
26c6437846
|
Merge branch 'master' into alerting
|
2016-08-22 12:27:08 +02:00 |
|
Mitsuhiro Tanda
|
6bd2bb04a7
|
(cloudwatch) add api gateway metrics/dimensions
|
2016-08-20 21:57:20 +09:00 |
|
bergquist
|
c663e32ea8
|
Merge branch 'database_url' of https://github.com/Scalingo/grafana into Scalingo-database_url
|
2016-08-19 13:15:44 +02:00 |
|
bergquist
|
d3421c671c
|
fix(alerting): make sure xorm can reset execution_error
|
2016-08-18 17:25:32 +02:00 |
|
bergquist
|
def4632f08
|
test(alerting): add falsification test
|
2016-08-18 14:13:39 +02:00 |
|
bergquist
|
d28df71c3b
|
feat(alerting): add support for "no_value" evaluator
|
2016-08-18 11:44:25 +02:00 |
|
Torkel Ödegaard
|
09cdf3e9e1
|
feat(alerting): show execution errors in alert list
|
2016-08-18 11:37:35 +02:00 |
|
Torkel Ödegaard
|
5cf9711862
|
feat(alerting): added eval match to test results
|
2016-08-18 11:22:24 +02:00 |
|
Torkel Ödegaard
|
902314d3a1
|
Merge branch 'alerting' of github.com:grafana/grafana into alerting
|
2016-08-18 09:04:00 +02:00 |
|
Torkel Ödegaard
|
75a6c2b612
|
feat(alerting): added validation that checks valid data source and checks for template variables in graphite query, #5841
|
2016-08-18 09:03:46 +02:00 |
|
bergquist
|
6d080904fa
|
tech(alerting): empty string does not update database
|
2016-08-17 22:13:27 +02:00 |
|
bergquist
|
4154a4066f
|
feat(alerting): handle all results, even due they have errors
DON'T SWALLOW THE ERR CARL
|
2016-08-17 22:12:08 +02:00 |
|
Torkel Ödegaard
|
63a283b4bc
|
feat(alerting): working on alert state filters for alert list
|
2016-08-17 11:00:00 +02:00 |
|
Torkel Ödegaard
|
da59d6547f
|
Merge branch 'alerting' of github.com:grafana/grafana into alerting
|
2016-08-17 10:03:57 +02:00 |
|
Torkel Ödegaard
|
05697d5ecd
|
Merge branch 'master' into alerting
Conflicts:
conf/sample.ini
|
2016-08-17 10:03:33 +02:00 |
|
Torkel Ödegaard
|
f9b628ad0e
|
Merge branch 'v3.1.x'
Conflicts:
conf/defaults.ini
conf/sample.ini
pkg/metrics/graphite.go
pkg/metrics/graphite_test.go
|
2016-08-17 09:53:46 +02:00 |
|
bergquist
|
6497b307c4
|
feat(alerting): save execution error upon state changed
|
2016-08-17 09:27:29 +02:00 |
|
bergquist
|
9915f15ed0
|
feat(alerting): adds sql layer for saving execution errors
|
2016-08-17 07:49:14 +02:00 |
|
Torkel Ödegaard
|
434332f02d
|
feat(alerting): changed fontsize in alert list
|
2016-08-16 21:26:54 +02:00 |
|
Torkel Ödegaard
|
15c11fdb54
|
Merge branch 'alerting' of github.com:grafana/grafana into alerting
|
2016-08-16 16:51:24 +02:00 |
|
Torkel Ödegaard
|
0b7fa3c19d
|
feat(alerting): minor progress on alert list, #5784
|
2016-08-16 16:50:36 +02:00 |
|
bergquist
|
c7cb93a33a
|
style(alerting): improve codestyle for evaluators
|
2016-08-16 12:44:31 +02:00 |
|
bergquist
|
fb7f2ae2e2
|
feat(alerting): adds within_range and outside_range evaluators
closes #5829
|
2016-08-16 12:37:07 +02:00 |
|
bergquist
|
b5d92b6191
|
test(alerting): fix broken tests
|
2016-08-16 12:37:07 +02:00 |
|
Torkel Ödegaard
|
6b90587d27
|
feat(alerting): fixing failing go unit test
|
2016-08-16 10:22:16 +02:00 |
|
Torkel Ödegaard
|
f934081bcb
|
feat(alerting): making progress on alerting list, #5784
|
2016-08-16 09:52:45 +02:00 |
|
Torkel Ödegaard
|
9f29c54170
|
Merge branch 'query_part_refactor' into alerting
Conflicts:
pkg/services/sqlstore/migrations/alert_mig.go
pkg/services/sqlstore/migrations/heartbeat_mig.go
|
2016-08-15 17:54:42 +02:00 |
|
Torkel Ödegaard
|
1418cbbd8b
|
feat(query_part): refactoring query part
|
2016-08-15 17:20:45 +02:00 |
|
Torkel Ödegaard
|
0392fde34e
|
feat(alerting): doing schema changes
|
2016-08-15 15:12:43 +02:00 |
|
bergquist
|
f7a9102523
|
feat(metrics): improve graphite settings
Fixes the broken support for overriding settings with ENV variables.
closes #5769
|
2016-08-15 09:59:55 +02:00 |
|
bergquist
|
cf6736d480
|
fix(metrics): add ending dot for graphite prefix
|
2016-08-15 09:58:32 +02:00 |
|
bergquist
|
41790c6709
|
fix(metrics): hide none existing metrics settings
|
2016-08-15 09:58:23 +02:00 |
|
bergquist
|
ebecc5e5a0
|
fix(metrics): make metrics cfg backwards compatible
|
2016-08-15 09:57:49 +02:00 |
|
bergquist
|
0524d0c625
|
fix(metrics): replaces . with _ in instance name
closes #5739
|
2016-08-15 09:57:00 +02:00 |
|
bergquist
|
2b2e015d62
|
feat(cli): add default plugin folder for MAC OS
closes #5806
|
2016-08-15 09:18:56 +02:00 |
|
bergquist
|
7a913f77d3
|
feat(cli): add default plugin folder for MAC OS
closes #5806
|
2016-08-15 08:54:35 +02:00 |
|
bergquist
|
4d0982a21c
|
Merge branch 'master' into alerting
|
2016-08-15 07:58:30 +02:00 |
|
Mitsuhiro Tanda
|
7a1011ac39
|
(cloudwatch) support ApplicationELB (#5802)
|
2016-08-14 13:21:17 +02:00 |
|
bergquist
|
fb7a6c0764
|
feat(alerting): list all series in alert email
|
2016-08-13 12:50:51 +02:00 |
|
bergquist
|
c4e905474a
|
feat(alerting): improve email notifications layout
|
2016-08-13 11:24:03 +02:00 |
|
Torkel Ödegaard
|
74dbd7fb36
|
feat(alerting): disable visual thresholds while alert is enabled
|
2016-08-12 13:19:06 +02:00 |
|
bergquist
|
1dcae464fe
|
chore(notifications): remove commented test
|
2016-08-12 10:17:21 +02:00 |
|
bergquist
|
16e75a3036
|
feat(alerting): add alert message to slack integration
|
2016-08-12 10:12:04 +02:00 |
|
bergquist
|
e7613b8bc0
|
fix(metrics): typo
|
2016-08-12 08:15:53 +02:00 |
|
bergquist
|
2fa97427eb
|
fix(metrics): add ending dot for graphite prefix
|
2016-08-12 08:06:54 +02:00 |
|
bergquist
|
937726499f
|
feat(alerting): add global usage metrics for alerting
closes #5786
|
2016-08-11 21:12:46 +02:00 |
|
bergquist
|
ae15de119f
|
Merge branch 'master' into alerting
|
2016-08-11 17:01:35 +02:00 |
|
bergquist
|
f07b2ac446
|
fix(metrics): hide none existing metrics settings
|
2016-08-11 17:00:09 +02:00 |
|
bergquist
|
cb6fd4ca78
|
test(alerting): fixes broken unit test
|
2016-08-11 16:55:08 +02:00 |
|
bergquist
|
99e99922b4
|
feat(alerting): add support for uploading images to webdav.
closes #5770
|
2016-08-11 16:48:54 +02:00 |
|
bergquist
|
95c1a4a936
|
feat(alerting): implement more simple reducers
|
2016-08-10 14:06:17 +02:00 |
|
bergquist
|
f2436fc7cd
|
test(alerting): add tests for simple reducer
|
2016-08-10 13:52:15 +02:00 |
|
Torkel Ödegaard
|
4fd8b2ace4
|
Merge branch 'master' into alerting
|
2016-08-10 12:53:41 +02:00 |
|
bergquist
|
03f0bc46a1
|
fix(metrics): make metrics cfg backwards compatible
|
2016-08-10 11:15:49 +02:00 |
|
bergquist
|
5b57210aeb
|
fix(metrics): replaces . with _ in instance name
closes #5739
|
2016-08-09 14:06:03 +02:00 |
|
bergquist
|
d6fdb598b0
|
fix(alerting): gofmt
|
2016-08-08 14:46:47 +02:00 |
|
Torkel Ödegaard
|
1edd224168
|
feat(alerting): fixing failing unit tests
|
2016-08-01 14:34:58 +02:00 |
|
Torkel Ödegaard
|
e6c4e47849
|
updated dependencies
|
2016-08-01 14:15:41 +02:00 |
|
Torkel Ödegaard
|
357358898d
|
feat(annotations): working on alert annotations, #5694
|
2016-08-01 10:07:00 +02:00 |
|
Torkel Ödegaard
|
3b69c8f687
|
feat(alerting): new design for alert tab with sidemenu
|
2016-07-31 09:31:32 +02:00 |
|
Torkel Ödegaard
|
2b276d5cd1
|
feat(alerting): working on alert notification and image rendering
|
2016-07-30 13:36:21 +02:00 |
|
Torkel Ödegaard
|
4fc50742a0
|
feat(alerting): working on image rendering with alert notifications
|
2016-07-29 14:55:02 +02:00 |
|
Torkel Ödegaard
|
f9a28d3306
|
feat(alerting): slack notification improvements, #5679
|
2016-07-29 13:41:42 +02:00 |
|
Torkel Ödegaard
|
01da3f6cb2
|
feat(alerting): worked on improving slack alerts
|
2016-07-28 17:03:53 +02:00 |
|
Torkel Ödegaard
|
717cce014b
|
feat(alerting): refactoring
|
2016-07-27 17:07:44 +02:00 |
|
Torkel Ödegaard
|
6aaf4c97a2
|
feat(alerting): refactoring conditions out to seperate package
|
2016-07-27 16:18:10 +02:00 |
|
Torkel Ödegaard
|
ae5f8a76d9
|
feat(alerting): lots of progress on notifications, refactored them out to their own package, restored webhook notitication and added slack notification
|
2016-07-27 12:09:55 +02:00 |
|
Torkel Ödegaard
|
77c66a88d9
|
Merge branch 'master' into alerting
|
2016-07-27 10:22:00 +02:00 |
|
Torkel Ödegaard
|
cde1bbff78
|
Merge branch 'alert_conditions' into alerting
|
2016-07-27 09:52:42 +02:00 |
|
Torkel Ödegaard
|
c675ffc682
|
Merge branch 'master' into alerting
|
2016-07-27 09:45:16 +02:00 |
|
Mark Henderson
|
39be7cf7d7
|
Added grafana-cli command. Added public documentation for specifying plugin version when installing. (#5665)
|
2016-07-27 09:41:33 +02:00 |
|
Torkel Ödegaard
|
0d9b98da6d
|
feat(alerting): progress on email notifications
|
2016-07-26 12:29:52 +02:00 |
|
Torkel Ödegaard
|
6cb1dafb1d
|
feat(alerting): progress on notifications
|
2016-07-25 16:26:28 +02:00 |
|
Torkel Ödegaard
|
8df558dece
|
feat(notifications): refactoring notification handling
|
2016-07-25 13:52:17 +02:00 |
|
Torkel Ödegaard
|
14eba30f63
|
feat(alerting): more work on notifications
|
2016-07-23 11:50:48 +02:00 |
|
Torkel Ödegaard
|
a6c6094775
|
feat(alerting): started reworking notifications
|
2016-07-22 16:45:17 +02:00 |
|
Mitsuhiro Tanda
|
490ea18638
|
(cloudwatch) fix, don't block by white list (#5632)
|
2016-07-22 13:15:18 +02:00 |
|
Torkel Ödegaard
|
7eb2d2cf47
|
feat(alerting): working on state management
|
2016-07-22 13:14:09 +02:00 |
|
Torkel Ödegaard
|
783d697529
|
feat(alerting): more output when testing alert
|
2016-07-21 21:54:12 +02:00 |
|
Torkel Ödegaard
|
b073fe0eba
|
feat(alerting): more work on handling result and saving state
|
2016-07-21 17:31:46 +02:00 |
|
Torkel Ödegaard
|
f0fc336e88
|
feat(alerting): worked on alert condition eval tests
|
2016-07-21 16:19:28 +02:00 |
|
Torkel Ödegaard
|
3ad38eefd2
|
feat(alerting): test results look better
|
2016-07-21 13:57:19 +02:00 |
|
Torkel Ödegaard
|
f6a160b270
|
feat(alerting): testing alert is starting to work
|
2016-07-21 13:09:12 +02:00 |
|
Torkel Ödegaard
|
9e91aacd34
|
feat(alerting): progress on testing alerts
|
2016-07-21 10:29:11 +02:00 |
|
Torkel Ödegaard
|
fb636344a6
|
feat(alerting): began work on testing alert rule from UI without having to save it
|
2016-07-20 16:13:36 +02:00 |
|
Torkel Ödegaard
|
0ce55600bb
|
feat(alerting): progress on alerting backend
|
2016-07-20 14:28:02 +02:00 |
|
Torkel Ödegaard
|
3219d98a92
|
feat(alerting): starting work on condition evaluation
|
2016-07-20 09:30:31 +02:00 |
|
Torkel Ödegaard
|
f872d5cfa3
|
feat(alerting): more refactoring work in backend code
|
2016-07-19 22:36:59 +02:00 |
|
Torkel Ödegaard
|
2a30baef05
|
feat(alerting): progress on updating extractor to work with new alert model
|
2016-07-19 21:00:41 +02:00 |
|
Torkel Ödegaard
|
f60efed5d8
|
feat(alerting): progress on refactoring backend alert rule model
|
2016-07-19 17:45:37 +02:00 |
|
Torkel Ödegaard
|
20fcffb71e
|
feat(alerting): working on alerting conditions model
|
2016-07-19 16:15:26 +02:00 |
|
Torkel Ödegaard
|
0f555d6ab5
|
fix(alerting): minor fix
|
2016-07-19 09:28:49 +02:00 |
|
Torkel Ödegaard
|
b0fe69822a
|
Merge branch 'master' into alerting
Conflicts:
public/app/core/services/alert_srv.ts
public/app/partials/confirm_modal.html
|
2016-07-18 18:22:35 +02:00 |
|
Torkel Ödegaard
|
f13b869aa4
|
feat(alerting): work on alerting
|
2016-07-14 13:32:16 +02:00 |
|
Torkel Ödegaard
|
624cd6fc0a
|
feat(alerting): cleanup, removed alert changes table and code
|
2016-07-13 11:58:55 +02:00 |
|
Torkel Ödegaard
|
4bb4d7f7d3
|
Merge branch 'v3.1.x'
|
2016-07-12 15:54:31 +02:00 |
|
Torkel Ödegaard
|
b2acac3a41
|
feat(apps): more polish on app dashboard save warning, #5529
|
2016-07-12 08:41:56 +02:00 |
|
Torkel Ödegaard
|
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 |
|
Torkel Ödegaard
|
08202dcb83
|
Merge branch 'v3.1.x'
|
2016-07-11 09:39:17 +02:00 |
|
Torkel Ödegaard
|
65683ab241
|
feat(table): added sanitize html option to column styles for table panel, fixes #4596
|
2016-07-11 09:38:06 +02:00 |
|