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
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
Torkel Ödegaard
beca72cc40
filterSrv refactoring cleanup and testing
2014-05-20 16:18:24 +02:00
Torkel Ödegaard
5ea07d0f07
Merge branch 'hkraemer-filtersrv-object-refactoring' of github.com:Tetha/grafana into Tetha-hkraemer-filtersrv-object-refactoring
2014-05-20 15:45:46 +02:00
Harald Kraemer
674390dfa2
Fixed unsaved changes alerting about timechanges only.
2014-05-20 12:40:56 +02:00
Torkel Ödegaard
e47994013a
updated changelog with PR #427
2014-05-20 12:04:23 +02:00
Torkel Ödegaard
6bbf2ff876
Merge pull request #427 from jippi/add-second-axis
...
Add seconds as a new axis formatter
2014-05-20 03:00:31 -07:00
Christian Winther
f7f567adc8
Add seconds as a new axis formatter
2014-05-20 08:55:19 +00:00
Harald Kraemer
e737b51e9d
Removed 2 console.logs
2014-05-20 10:24:03 +02:00
Harald Kraemer
6f2dd2e2a5
Fixed an old method name
2014-05-20 10:23:49 +02:00
Harald Kraemer
36b44d6971
Moved init calls to setup method
2014-05-20 10:23:36 +02:00
Harald Kraemer
dcea2c5f4e
Fixed last test + a mistake in other tests setup
...
- filterSrv expects the parameter to init to be the actual
dashboard object (I'll depend on that later on), so
I had to pass dashboard.current in there, instead of
dashboard
- in the last test, the problem was exactly that again.
2014-05-20 10:00:15 +02:00
Harald Kraemer
ed76d718cd
Fixed setTime should disable refresh test
...
- init with dashboard mock
2014-05-20 09:56:50 +02:00
Harald Kraemer
00e1a1c442
Fixed timerange parsed = true test
...
- had to call init with dashboard mock
2014-05-20 09:54:07 +02:00
Harald Kraemer
f2b9ea1034
Fixed timerange unparsed
...
- had to call init with the dashboard mock, since this checks
dashboard.refresh (need to look at that sometime)
2014-05-20 09:52:55 +02:00
Harald Kraemer
1cbc352c6c
Fixed (filter->template)OptionSelected test
...
- small misunderstanding on my part, fixed the API in the filterSrv back
- renames to match my renames
- init script has to be called or fundefined things happen
2014-05-20 09:48:36 +02:00
Harald Kraemer
51b70a7884
Fixed init-test.
...
Mostly renames, new init semantic and I forgot to call
updateTemplateParams in addTemplateParameter
2014-05-20 09:43:57 +02:00
Harald Kraemer
d04f2d5e2b
Renamed most filter-related things in filterSrv to template.
...
After all, we are using the function "template" to apply some
data we pull from the URL or other situations in order to call
a function called template. Hence, filtering doesn't make sense
as a term here.
2014-05-20 09:27:54 +02:00
Harald Kraemer
b1c9d5fd4a
Warnings in filterSrv
2014-05-19 17:05:53 +02:00
Harald Kraemer
4b8b961705
Warnings in dashboardKeybindings.js
2014-05-19 17:04:59 +02:00
Harald Kraemer
2e26130d96
Warnings in graphiteTarget.js
2014-05-19 17:02:06 +02:00
Harald Kraemer
63c75f714f
Warnings in dash.js
2014-05-19 17:01:09 +02:00
Harald Kraemer
03095dfa74
Changed filterSrv singleton into object in scope.
...
This rework isn't entirely complete here, I haven't
checked the tests yet and I didn't really test anything
furthermore yet, so bear with this commit breaking things.
Besides that, the goal of this commit was to rework the
filterSrv singleton into a factory, so we move the filterSrv
instance around via the scope. This should be a better solution
than the current situation, because services shouldn't contain
model data - the scope should.
This will eventually straighten out control flow between dashboard,
filters and so on, and allow us to leverage angularJS mechanics more.
The latter has already started, since I could rework a bit of the
existing event infrastructure to watches on times.
2014-05-19 15:31:30 +02:00
Harald Kraemer
f70bf61ff6
Added vim swp files to gitignore
2014-05-15 15:07:03 +02:00
