Alexander Zobnin
3be84b00d5
ES nested fields autocomplete ( #6043 )
...
* Re-create PR #4527 from @arcolife:
fixes #4526 - add nested support to fieldname autocomplete; Also:
- update _mapping to first use given time range
for deducting index mapping, then fallback to
today's date based index name
* (elasticsearch): refactor getFields() method.
* (elasticsearch): add tests for getFields() method.
* (elasticsearch): fixed _get() method (tests was broken after @arcolife commit).
2016-09-15 07:30:08 +02:00
bergquist
31892ed73c
style(alertlist): remove unused code
2016-09-14 14:21:56 +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
bergquist
b49a642ca5
feat(alerting): extract method for join eval matches
2016-09-14 10:49:05 +02:00
bergquist
d02f29fb02
feat(alertlist): basic alert list panel
...
ref #5981
2016-09-14 10:49:05 +02:00
Torkel Ödegaard
babab7677c
tech(lib upgrade): fixed issue with angular 1.5.8, so can revert revert of upgrade, that is we are no on latest angularjs, #6022
2016-09-14 10:45:56 +02:00
Torkel Ödegaard
c594f9f2ad
fix(lodash): corrected checked in lodash version
2016-09-14 10:13:33 +02:00
Torkel Ödegaard
649d9f9177
tech(lodash): upraded lodash to 4.15.0, closes #6021
2016-09-14 09:17:10 +02:00
Torkel Ödegaard
0fa0066cd9
tech(lodash): began migration work
2016-09-13 22:10:44 +02:00
Torkel Ödegaard
2146e69a11
revert angularjs upgrade
2016-09-13 21:26:28 +02:00
Torkel Ödegaard
fffa26b876
tech(lib upgrade): updated jquery to 3.1, fixes #6034
2016-09-13 20:42:28 +02:00
Torkel Ödegaard
25139c77b9
tech(update angularjs): updated angularjs to 1.5.9
2016-09-13 20:33:49 +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
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
bergquist
6a723dff37
feat(notifications): set default value to false for new notifications
2016-09-13 14:25:48 +02:00
Torkel Ödegaard
6375418d8c
Merge branch 'alerting' into grafana-annotations
2016-09-13 09:38:12 +02:00
Jouni Kuusisto
e53b815956
Enable "With Credentials" for InfluxDB datasource ( #6018 )
2016-09-13 08:57:39 +02:00
bergquist
03fb152d4b
tech(templates): extract sort method
2016-09-13 08:11:04 +02:00
bergquist
9c5436c648
feat(templating): set default sort order
2016-09-13 07:39:30 +02:00
bergquist
e348822190
Merge branch 'template_sort' of https://github.com/mtanda/grafana into mtanda-template_sort
2016-09-13 07:16:34 +02:00
Torkel Ödegaard
014b70ded9
fix(graph): fixed showing rendering error in inspector, fixes #5995
2016-09-10 12:00:33 +02:00
Torkel Ödegaard
7aab4a4a59
fix(table): fixed issue with using mixed data source in table panel, fixes #5999
2016-09-10 09:57:25 +02:00
Torkel Ödegaard
4a2f2fba73
feat(alerting): show panel specific alert annotations, #5694
2016-09-09 11:30:55 +02:00
Carl Bergquist
51d2534f6a
Merge pull request #5994 from mtanda/prometheus_fix_legend_template
...
(prometheus) fix template variable expansion in legend
2016-09-08 18:37:27 +02:00
Mitsuhiro Tanda
9d09e5bbd0
(prometheus) fix template variable expansion in legend
2016-09-09 00:46:04 +09:00
Torkel Ödegaard
0ac4ece00d
feat(annotations): refactoring annotations srv to typescript, #5990
2016-09-08 14:31:30 +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
5f934e0238
feat(emails): move bg color to main table
2016-09-08 09:59:51 +02:00
bergquist
21c5b543fb
feat(profile): hide orgs list when it only contains one org
2016-09-08 09:03:29 +02:00
bergquist
f56d45ac56
feat(alerting): include default notifications in alert tab
2016-09-07 15:13:24 +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
