Torkel Ödegaard
|
d60bd77658
|
feat(annotations): added support to show grafana stored annotations in graphs, #5982
|
2016-09-08 11:25:45 +02:00 |
|
bergquist
|
f26824049f
|
Merge branch 'master' into emails
|
2016-09-07 11:19:52 +02:00 |
|
bergquist
|
374016b9b5
|
Merge branch 'kfitzpatrick-custom-github-style-oauth'
|
2016-09-07 11:07:30 +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
|
22805ce56b
|
fix(alert_tab): fix broken alert history
|
2016-09-06 14:42:34 +02:00 |
|
bergquist
|
55b560a4a8
|
feat(alerting): filter notifications based on severity
closes #5851
|
2016-09-06 14:27:48 +02:00 |
|
Torkel Ödegaard
|
b1ed641d73
|
fix(graph): fixed issue with duplicate metric calls when doing full page reload of graph in edit/view mode
|
2016-09-06 09:20:34 +02:00 |
|
Torkel Ödegaard
|
6b17cdbca6
|
feat(alerting): Save As removes alerts from panels, closes #5965
|
2016-09-06 09:14:11 +02:00 |
|
bergquist
|
c893e5d241
|
feat(notifications): add support for default notifications
ref #5883
|
2016-09-05 21:35:37 +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
|
e2f5bf1666
|
feat(alerting): fixed confirm delete dashboard issue
|
2016-09-05 13:38:25 +02:00 |
|
bergquist
|
daea38060f
|
feat(notifications): redirect to notification list after creation.
|
2016-09-05 08:27:12 +02:00 |
|
Hiroaki Kobayashi
|
3645fb371c
|
fix typo
|
2016-09-02 15:22:04 +09:00 |
|
bergquist
|
e493015f54
|
fix(alerting): replace one hack with another hack
|
2016-08-31 10:10:39 +02:00 |
|
bergquist
|
53a9dec407
|
feat(alerting): move timestamp to new row
ref #5850
|
2016-08-31 09:48:58 +02:00 |
|
Trent White
|
00f82010f8
|
tweaked alert example to see if there were any visual changes
|
2016-08-30 12:11:00 -04:00 |
|
Trent White
|
852a8b77e4
|
table tweak
|
2016-08-30 12:04:26 -04:00 |
|
bergquist
|
b55b7cde4b
|
fix(alerting): remove error message when model is valid again
closes #5921
|
2016-08-30 13:36:13 +02:00 |
|
bergquist
|
11a4ff0f8a
|
feat(alerting): add basic UI for history in alert tab
ref #5850
|
2016-08-30 13:22:59 +02:00 |
|
Trent White
|
90873cfe76
|
getting tables to behave on mobile
|
2016-08-29 16:55:19 -04:00 |
|
chrismartin0077
|
88ca695361
|
feat(influxdb) add elapsed(), fixes #5827
|
2016-08-29 07:05:10 -07:00 |
|
cmartin0077
|
9c08d7aef5
|
fix(influxdb) fix tag value autocomplete with upper case values, fixes #5399 (#5919)
|
2016-08-29 13:03:54 +02:00 |
|
Trent White
|
ab4f06bc54
|
redesign email template
|
2016-08-26 14:25:39 -04:00 |
|
Trent White
|
35b90afdd0
|
initial styling
|
2016-08-24 17:41:29 -04:00 |
|
bergquist
|
7095a9d7e1
|
Merge branch 'master' into alerting
|
2016-08-22 15:31:33 +02:00 |
|
bergquist
|
f3d6035c59
|
feat(alerting): add alerts for notification edits
|
2016-08-22 14:49:40 +02:00 |
|
bergquist
|
26c6437846
|
Merge branch 'master' into alerting
|
2016-08-22 12:27:08 +02:00 |
|
bergquist
|
5a33679470
|
fix(alerting): remove has no value condition
|
2016-08-22 12:20:07 +02:00 |
|
Mitsuhiro Tanda
|
d9fe41cc8d
|
(prometheus) refactor time calculation
|
2016-08-20 22:51:33 +09:00 |
|
Carl Bergquist
|
9fdda0e269
|
Merge pull request #5613 from ctrochalakis/group_by_nodes
feat(graphite): added groupByNodes func def, closes #5612
|
2016-08-19 15:16:40 +02:00 |
|
bergquist
|
e415412691
|
feat(alerting): add image for howto popup
closes #5784
|
2016-08-18 18:36:58 +02:00 |
|
bergquist
|
6d60d125d3
|
Merge branch 'Othyus-filter_orgs'
|
2016-08-18 15:48:47 +02:00 |
|
bergquist
|
e3bbf96b37
|
Merge branch 'filter_orgs' of https://github.com/Othyus/grafana into Othyus-filter_orgs
|
2016-08-18 15:48:01 +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
|
2f953d75a6
|
Merge branch 'alerting' of github.com:grafana/grafana into alerting
|
2016-08-18 10:07:45 +02:00 |
|
Torkel Ödegaard
|
9028d4899f
|
feat(alerting): alert list fixes
|
2016-08-18 10:07:31 +02:00 |
|
bergquist
|
631acc2bf9
|
feat(alerting): only show available queries in alert query
|
2016-08-18 10:02:17 +02:00 |
|
Torkel Ödegaard
|
9b5a7b5ef6
|
feat(alerting): added alert howto text, closes #5784
|
2016-08-18 09:58:20 +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 |
|
Roman Vynar
|
d086f5d398
|
Align step with interval passed to Prometheus query using rate() (#5839)
|
2016-08-18 08:19:32 +02:00 |
|
Torkel Ödegaard
|
2e7cb04490
|
feat(alerting): some final changes to alert list #5784
|
2016-08-17 15:48:58 +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
|
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 |
|
Torkel Ödegaard
|
2b2b64865b
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-08-17 09:42:52 +02:00 |
|
Torkel Ödegaard
|
159ea69e5d
|
fix(OpenTSDB): correct content-type, fixes #4965
|
2016-08-17 09:42:40 +02:00 |
|
Torkel Ödegaard
|
a5f0f508ea
|
feat(inspector): fixed error handling, showing response body when data proxy returns text/html body
|
2016-08-16 22:31:26 +02:00 |
|