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
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
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
Torkel Ödegaard
23aa614baf
feat(rendering): fixed issue with png rendering, recently introduced by profiler refactoring
2016-06-17 08:49:11 +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
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
8ec311ade4
Merge branch 'master' into alerting
2016-06-16 16:29:41 +02:00
Torkel Ödegaard
b039a81375
feat(build): fixing windows build issue, #5370
2016-06-16 14:36:19 +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
Torkel Ödegaard
79eb971fad
docs(): updated changelog
2016-06-16 10:49:40 +02:00
Torkel Ödegaard
81e9aa4de4
feat(datasource): cancel in flight data source requests, refeatoring #5321
2016-06-16 10:48:26 +02:00
bergquist
c51facfaef
style(alerting): move filter below HR
2016-06-16 09:23:53 +02:00
Torkel Ödegaard
6d3521c240
Merge branch 'cancel-in-flight-repeats' of https://github.com/stuartnelson3/grafana into stuartnelson3-cancel-in-flight-repeats
2016-06-16 08:57:31 +02:00
Torkel Ödegaard
23e0240410
fix(build): removed logging call that caused wrong dependency to be used
2016-06-16 08:55:36 +02:00
Torkel Ödegaard
1ae24b366f
feat(profiler): fixed issues with frontend perf profiler
2016-06-16 08:28:50 +02:00
Torkel Ödegaard
2ceb58d0c4
feat(elasticsearch): removed dashboard import migration
2016-06-16 08:11:40 +02:00
Torkel Ödegaard
e1f63a3346
docs(): updated changelog
2016-06-16 08:10:15 +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
Torkel Ödegaard
4b78ab5bcd
feat(graph): graph tooltip sort order PR refactored/changed #4944 , changed the layout graph display options, #4944
2016-06-15 17:20:55 +02:00
Torkel Ödegaard
ae554a736b
change(graphite): removed graphite png option in graph panel, closes #5367
2016-06-15 14:20:44 +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
a893152141
feat(alerting): thesholds unification
2016-06-15 10:41:21 +02:00
Torkel Ödegaard
f03e8292a2
feat(alerting): progress on threshold unification
2016-06-14 17:00:51 +02:00
Torkel Ödegaard
ed7a539ddb
feat(alerting): thresholds rethink
2016-06-14 16:45:51 +02:00
Carl Bergquist
f842e28b85
Merge pull request #5343 from utkarshcmu/opentsdb-template
...
Implemented nested template variables functionality for Opentsdb
2016-06-14 07:43:41 +02:00
utkarshcmu
33aa3f0fc5
Made tag_values query more robust
2016-06-13 14:21:46 -07: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
bb6888885e
fix(alerting): makes valid to save more explicit
2016-06-13 15:01:07 +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
utkarshcmu
e4e042e389
CHANGELOG entry
2016-06-13 04:53:21 -07:00
