IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-16 18:34:52 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,503 Commits 5,454 Branches 554 Tags 1.9 GiB
af1c8dc5d9
Commit Graph

7503 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
3adee1eda0 tech(sass): sasslint fixes for css3 
Pseudo-elements must start with double colons pseudo-element
 2016-06-20 10:37:47 +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
Torkel Ödegaard
23aa614baf feat(rendering): fixed issue with png rendering, recently introduced by profiler refactoring 2016-06-17 08:49:11 +02:00
Torkel Ödegaard
5c35fac8fe fix(dataproxy): removed accidental debug code 2016-06-17 08:11:37 +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
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
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