Torkel Ödegaard
346ca3fc89
Merge branch 'master' into alerting
2016-06-25 09:56:57 -04:00
Torkel Ödegaard
23345c563c
changed version in master to 3.2-pre
2016-06-24 16:51:55 +02:00
Torkel Ödegaard
60f45c965c
Merge branch 'master' of github.com:grafana/grafana
2016-06-24 10:25:44 +02:00
Torkel Ödegaard
efad4bcb56
docs(): updated changelog
2016-06-23 17:45:29 +02:00
Torkel Ödegaard
9435e70b37
docs(): spelling fix
2016-06-23 17:31:22 +02:00
bergquist
2063fee4fe
docs(changelog): add note about cli fix #5410
2016-06-23 15:16:26 +02:00
Torkel Ödegaard
c3e1955792
docs(): updated export docs
2016-06-23 13:21:30 +02:00
Torkel Ödegaard
838284c09f
docs(): updated changelog
2016-06-23 10:38:11 +02:00
Torkel Ödegaard
1d35b90484
docs(): updated download links
2016-06-23 10:35:47 +02:00
Torkel Ödegaard
f3c1a894de
changed version to 3.1-beta1
2016-06-23 09:12:17 +02:00
bergquist
af1c8dc5d9
feat(cli): adds support for dist/plugin.json location for plugins
...
ref #5410
2016-06-23 08:35:40 +02:00
bergquist
2123fbdf9b
feat(cli): make remove command an alias for uninstall
2016-06-23 08:21:55 +02:00
bergquist
14169c5092
tech(docker): add memcached exporter target for prom
2016-06-22 17:36:22 +02:00
Torkel Ödegaard
0555525f97
tech(): updated list of docker stuff
2016-06-22 11:01:11 +02:00
Torkel Ödegaard
24a54cd95b
feat(units): refactoring #5404
2016-06-21 21:08:07 +02:00
Torkel Ödegaard
a7a5f36b49
Merge branch 'issue-2971' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-issue-2971
2016-06-21 21:00:00 +02:00
Alexander Zobnin
ab0155c861
Issue #2971 - add time units for use in singlestat panel.
2016-06-21 20:56:34 +03:00
Torkel Ödegaard
53c424caf8
docs(): title change
2016-06-21 18:25:24 +02:00
Torkel Ödegaard
23cfbac4ec
feat(docs): updated import / export docs
2016-06-21 18:24:25 +02:00
Torkel Ödegaard
f23d72001d
fix(dashboard): fixed issue triggering refresh after leaving fullscreen/edit mode with time range change
2016-06-21 17:21:45 +02:00
Torkel Ödegaard
302ad5f1f9
Merge branch 'master' of github.com:grafana/grafana
2016-06-21 17:08:16 +02:00
Torkel Ödegaard
257e6c469e
feat(collectd): updated collectd config
2016-06-21 17:07:01 +02:00
bergquist
ef9766eb96
docs(3.1): initial post about whats new in 3.1
2016-06-21 16:29:17 +02:00
bergquist
aa9e524e73
tech(docker): add node exporter to prometheus
2016-06-21 11:46:08 +02:00
Carl Bergquist
3b1ae3f7d2
Merge pull request #5396 from hailthemelody/fix_issue_template_typos
...
fix typos in GitHub Issue Template
2016-06-21 10:27:41 +02:00
hailthemelody
cccfe47bf0
fix typos in GitHub Issue Template
2016-06-20 21:39:11 -04:00
Carl Bergquist
87ab97b5ed
Merge pull request #5391 from wkruse/prometheus-annotations-doc
...
Add Prometheus annotations doc
2016-06-20 18:49:00 +02:00
Wadim Kruse
3b47b1ecbd
Add Prometheus annotations doc
2016-06-20 18:36:05 +02:00
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
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
Alexander Zobnin
398e9f5195
issue #4747 - add date and time units to singlestat panel.
2016-06-17 22:51:08 +03: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
