Commit Graph

1507 Commits

Author SHA1 Message Date
Clicky
3cc83ced93 Merge branch 'master' into add-influx-group-by
Conflicts:
	.gitignore
	src/app/partials/influxdb/editor.html
	src/app/services/influxdb/influxdbDatasource.js
2014-06-06 11:52:02 -07:00
Torkel Ödegaard
0ad4f3b85e Row editing and adding new panel is now a lot quicker and easier with the new row menu (Issue #475) 2014-06-06 18:30:15 +02:00
Torkel Ödegaard
2d061ce45a changed default row height to 250px 2014-06-06 16:05:56 +02:00
Torkel Ödegaard
6e2348d2b1 renamed graphite panel to graph 2014-06-06 16:03:39 +02:00
Torkel Ödegaard
525c4d529e cleanup, removal of unused code 2014-06-06 15:51:49 +02:00
Torkel Ödegaard
ea84149c87 Fix for exclusive series toggling (hold down CTRL, SHIFT or META key) and left click a series for exclusive toggling
CTRL does not work on MAC OSX but SHIFT or META should (depending on browser) (Closes #350, Fixes #472)
2014-06-06 11:23:17 +02:00
Torkel Ödegaard
af1855601b Improvement to InfluxDB query editor and function/value column selection, more space efficient, Closes #473 2014-06-06 10:56:38 +02:00
Torkel Ödegaard
1409065005 Merge branch 'master' into mavimo-feature/influxdb-filters 2014-06-06 08:59:06 +02:00
Torkel Ödegaard
623019ee56 Merge branch 'master' of github.com:grafana/grafana 2014-06-06 08:58:24 +02:00
Torkel Ödegaard
740d477801 added a little padding for metric target editor rows, making tthem sligly heigher 2014-06-06 08:58:14 +02:00
Torkel Ödegaard
c2b8f21fd9 small changes to PR #327, Partial support for url encoded metric names when using graphite datasource 2014-06-05 20:50:14 -07:00
Torkel Ödegaard
442ed87cfa Merge branch 'urldecode' of github.com:axe-felix/grafana into axe-felix-urldecode 2014-06-05 20:17:11 -07:00
Torkel Ödegaard
c48b3ded2f Fix for graphite function selection menu that some times draws outside screen. It now displays upward (Fixes #293) 2014-06-03 19:07:59 -07:00
Torkel Ödegaard
5bed5b9870 Fixing PR for influxdb filters 2014-06-03 21:23:42 +02:00
Torkel Ödegaard
2a261a32e2 Merge branch 'feature/influxdb-filters' of github.com:mavimo/grafana into mavimo-feature/influxdb-filters 2014-06-03 21:06:36 +02:00
Torkel Ödegaard
7137a9986f Fix to series toggling bug that caused annotations to be hidden when toggling (hiding) series. Fixes #328 2014-06-03 06:28:16 -07:00
Torkel Ödegaard
4ce386c6dd updated changelog - merge 2014-06-03 06:10:32 -07:00
Torkel Ödegaard
8911da8380 updated changelog 2014-06-03 06:08:42 -07:00
Torkel Ödegaard
a3384d514f Merge pull request #461 from tmonk42/isNonNull
add graphite function isNonNull
2014-06-03 06:05:32 +02:00
Haneysmith, Nathan
b38f6e8062 add graphite function isNonNull 2014-06-02 16:01:42 -07:00
Clicky
6c006d0a78 Don't retry on http status codes >= 300
These status codes are likely to be to be unretryable errors coming from
influx (most likely bad queries)
2014-06-02 13:15:10 -07:00
Torkel Ödegaard
0f7a55d031 improved asset (css/js) build pipeline, added revision to css and js. Will remove issues related to the browser cache when upgrading grafana and improve load performance (Fixes #418) 2014-06-02 20:29:30 +02:00
Torkel Ödegaard
62af77979b Legend Current value did not display when value was zero, Fixes #460 2014-06-02 19:29:59 +02:00
Torkel Ödegaard
384687e19b Added parameter to keepLastValue graphite function definition (default 100), Closes #459 2014-06-02 19:17:05 +02:00
Torkel Ödegaard
f799ded434 worked on css and js asset reving, and angular partial precaching, still need to fix panel module.html, issue #418 2014-06-01 16:57:59 +02:00
Torkel Ödegaard
d499f4e0d0 build system changes 2014-05-31 15:32:00 +02:00
Torkel Ödegaard
fc7b4df98a working on angular partials pre caching, reving 2014-05-31 15:20:12 +02:00
Torkel Ödegaard
3f9a8ecc7e Merge branch 'master' of github.com:grafana/grafana 2014-05-31 12:28:55 +02:00
Torkel Ödegaard
71a801bbb7 updated changelog 2014-05-31 11:54:43 +02:00
Torkel Ödegaard
f333ef803a Merge pull request #455 from casa87/patch-1
influxdb:difference feature
2014-05-31 10:33:08 +02:00
Torkel Ödegaard
36b1dce7e4 trying to get css, and js build file revisioning working 2014-05-31 00:22:49 -07:00
Torkel Ödegaard
877ef36bc7 added css concat task 2014-05-30 22:46:39 -07:00
casa87
6ce242df4d Fix line length 2014-05-30 16:01:25 -07:00
casa87
9640f0251c influxdb:difference feature
Add support for the difference query from InfluxDB
2014-05-30 14:40:43 -07:00
Torkel Ödegaard
53846a15de fixed issue with influxdb datasource introduced in recent filterSrv refactoring 2014-05-29 22:17:01 -07:00
Torkel Ödegaard
1e4ff1e774 Added config setting for default playlist timespan 2014-05-29 21:05:49 -07:00
Torkel Ödegaard
0f40e06d93 Merge branch 'timespanconfig' of github.com:rmca/grafana into rmca-timespanconfig 2014-05-29 20:53:51 -07:00
Torkel Odegaard
86b204ac08 fixed failing unit test 2014-05-27 20:13:49 +02:00
Torkel Ödegaard
8cd5a9963f Fixes for filter option loading and nested filters. Fixes #447, Fixes #412 2014-05-27 19:21:21 +02:00
Torkel Ödegaard
df796e32eb fixed issue with filtersrv refactoring and removing filter parameter 2014-05-27 18:29:14 +02:00
Torkel Ödegaard
e2dae1f484 cleanup of unused code, small style changes 2014-05-27 18:18:05 +02:00
Torkel Ödegaard
8ca06e11de refactoring unsavedChangesSrv and who now owns original 2014-05-27 17:17:12 +02:00
Torkel Ödegaard
9f548b9dee filterSrv refactoring fixes 2014-05-27 16:39:16 +02:00
rob
31c75886c3 Making the default playlist timespan configurable. 2014-05-26 13:12:26 +01:00
Torkel Ödegaard
3e24a87ead trying to get this PR working. a lot has changed and is broken 2014-05-25 21:03:53 +02:00
Torkel Ödegaard
992bcccee9 Merge branch 'master' into Tetha-hkraemer-filtersrv-object-refactoring 2014-05-25 19:08:28 +02:00
Torkel Ödegaard
02bf5f9a58 updated changelog with PR #390, special characters in series names (influxdb) 2014-05-25 17:04:51 +02:00
Torkel Ödegaard
adaf9cbc90 merge PR #390 2014-05-25 17:00:51 +02:00
Clicky
f9ede4bae9 Check for negative return 2014-05-23 11:46:36 -07:00
Clicky
1fe9132761 Cleanup from jshint 2014-05-22 23:14:43 -07:00