bergquist
12706fd6db
Revert "docs(changelog): add note about singlestat to datetime func"
...
This reverts commit 8efa94e42a
2016-06-20 11:04:01 +02:00
Carl Bergquist
d8be2f1ecc
Merge pull request #5389 from grafana/revert-5383-issue-4747
...
Revert "issue #4747 - add date and time units to singlestat panel."
2016-06-20 11:02:43 +02:00
Carl Bergquist
b6f9d9feb0
Revert "issue #4747 - add date and time units to singlestat panel."
2016-06-20 11:02:29 +02:00
bergquist
8efa94e42a
docs(changelog): add note about singlestat to datetime func
2016-06-20 10:59:47 +02:00
Carl Bergquist
b94527f661
Merge pull request #5383 from alexanderzobnin/issue-4747
...
issue #4747 - add date and time units to singlestat panel.
2016-06-20 10:57:08 +02:00
bergquist
96e5ad3f5c
Merge branch 'alerting' into alerting_notifications
2016-06-20 10:45:05 +02:00
bergquist
dd8c3d0355
Merge branch 'master' into alerting
2016-06-20 10:44:48 +02:00
bergquist
3adee1eda0
tech(sass): sasslint fixes for css3
...
Pseudo-elements must start with double colons pseudo-element
2016-06-20 10:37:47 +02:00
bergquist
7c09a140c7
test(alerting): fixes broken tests for alerting thresholds
2016-06-20 10:06:18 +02:00
bergquist
4c4164bb40
test(alerting): adds test email creater
2016-06-20 07:49:08 +02:00
Leandro Piccilli
2205ce5354
Add some tests for ES 5.x
2016-06-20 00:40:16 +02:00
Alexander Zobnin
398e9f5195
issue #4747 - add date and time units to singlestat panel.
2016-06-17 22:51:08 +03:00
bergquist
adea539b8d
feat(alerting): add link to panel png
2016-06-17 16:43:14 +02:00
bergquist
ea4b14ac22
feat(alerting): rename critical -> crit
2016-06-17 16:40:48 +02:00
bergquist
212fd27252
feat(alerting): add support for email notifications
2016-06-17 15:30:17 +02:00
bergquist
774add94c1
feat(alerting): skip warn check if crit is triggered
2016-06-17 15:24:17 +02:00
Torkel Ödegaard
90c063060a
fix(png): fixed phantomjs rendering issue with graph and y-axis label rotation, fixes #5220
2016-06-17 14:36:10 +02:00
Torkel Ödegaard
3bcda9268a
feat(styleguide): removed unused/empty tabs
2016-06-17 14:18:24 +02:00
Torkel Ödegaard
e2b398a6bf
Merge branch 'master' of github.com:grafana/grafana
2016-06-17 14:16:25 +02:00
Torkel Ödegaard
fa10fc994a
fix(graph): remove panel width cache, causing issues, does not handle window resize and fullscreen to dashboard, #5297
2016-06-17 14:16:01 +02:00
Drew Farris
cb2b8dea96
OpenTSDB: consistent options for http requests ( #5233 )
...
* OpenTSDB: consistent options for http requests
. the get function wasn't using the same request options wrt to credentials/auth as
the timeseries http request
* OpenTSDB: `_get` `_performTimeSeriesQuery` refactor copied code
2016-06-17 14:04:40 +02:00
Torkel Ödegaard
9bcd5de8ff
fix(share): fixed PNG render link generated from share modal when opened from edit mode, fixes #5295
2016-06-17 14:03:59 +02:00
Torkel Ödegaard
9f9fca1e76
feat(datasource): added suggest urls for each data source, #4577
2016-06-17 13:35:29 +02:00
Alexander Zobnin
fdf46c6a10
Issue 4577 ( #5379 )
...
* Add default-url property for datasource-http-settings directive.
This will allow to set default url for datasource.
* Fixed spelling.
* Use typeahead for url suggestion.
2016-06-17 13:18:00 +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
90e3d8afda
Merge branch 'alerting' into alerting_notifications
2016-06-17 09:55:58 +02:00
bergquist
c96108226c
fix(alerting): use alert frequency
2016-06-17 09:55:42 +02:00
bergquist
764c58ba8d
Merge branch 'alerting' into alerting_notifications
2016-06-17 09:54:38 +02:00
bergquist
9481fcb830
fix(alerting): use alert frequency
2016-06-17 09:54:11 +02:00
Torkel Ödegaard
23aa614baf
feat(rendering): fixed issue with png rendering, recently introduced by profiler refactoring
2016-06-17 08:49:11 +02:00
bergquist
ebada26b85
Merge branch 'alerting' into alerting_notifications
2016-06-17 08:27:58 +02:00
bergquist
e8a324c7f5
feat(alerting): add frequency back to alert model
2016-06-17 08:27:38 +02:00
Torkel Ödegaard
5c35fac8fe
fix(dataproxy): removed accidental debug code
2016-06-17 08:11:37 +02:00
bergquist
946dc0ecf3
Merge branch 'alerting' into alerting_notifications
2016-06-17 07:44:39 +02:00
bergquist
1771ab032e
Merge branch 'master' into alerting
2016-06-17 07:44:21 +02:00
bergquist
8b2f6fffc9
test(dashboards): comment code in broken tests
2016-06-17 07:43:57 +02:00
Torkel Ödegaard
32479503bd
fix(build): another windows build issue
2016-06-16 21:10:30 +02:00
Torkel Ödegaard
b06ec734f1
fix(build): windows, another windows build fix, #5370
2016-06-16 18:21:12 +02:00
bergquist
b035074613
tech(alerting): disable update state api
2016-06-16 17:02:45 +02:00
bergquist
a0418da160
Merge branch 'alerting' into alerting_notifications
2016-06-16 16:49:16 +02:00
bergquist
8ec311ade4
Merge branch 'master' into alerting
2016-06-16 16:29:41 +02:00
bergquist
3c4d2b8ca1
feat(alerting): add basic body for webhooks
2016-06-16 16:25:23 +02:00
bergquist
6705efef6f
feat(alerting): make some settings properties required
2016-06-16 16:18:40 +02:00
bergquist
f3009dc23b
fix(alerting): broken link
2016-06-16 16:06:40 +02:00
bergquist
b907ce341c
feat(alerting): enables deletes for alert notifications
2016-06-16 15:21:44 +02:00
bergquist
149c2ae913
feat(alerting): add submenu for alerting
2016-06-16 15:21:23 +02:00
Torkel Ödegaard
b039a81375
feat(build): fixing windows build issue, #5370
2016-06-16 14:36:19 +02:00
bergquist
7f767224af
feat(alerting): basic support for creating and updating notifications
2016-06-16 14:29:20 +02:00
Joel Smith
46fe9a167e
Update file_export.ts ( #5325 )
...
Prepended first line to export file containing
`sep=;\n`
which I believe should be all that is required for Excel to interpret the CSV file as semicolon delimited.
2016-06-16 14:27:00 +02:00
bergquist
Leandro Piccilli
Alexander Zobnin
Torkel Ödegaard
Drew Farris
Joel Smith