Commit Graph

1399 Commits

Author SHA1 Message Date
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
Harald Kraemer
4a362704fd Moved dashboard keybinding setup to own service.
The goal is to split up the situation between the dashboard
controller and the current dashboard service. I want to be
able to use the routing in order to select various dashboard
controllers, so I can extend the current scripting
mechanism by implementing new dashboard controllers.

However, to do this in a non-insane way, I need to move as
much functionality as possible into services, so the individual
controllers just need to throw the right set of services
together and add a bit of loading logic.
2014-05-15 15:04:23 +02:00
Harald Kraemer
2c43fdc409 Merge branch 'master' of github.com:Tetha/grafana 2014-05-15 13:17:03 +02:00
Torkel Ödegaard
2a6a3a3af5 updated changelog 2014-05-13 20:20:28 +02:00
Torkel Ödegaard
d8e2192179 Updated version to 1.5.4 2014-05-13 19:08:46 +02:00
Torkel Ödegaard
cfc5fa87d0 Merge branch 'gridmin' of github.com:kamaradclimber/grafana into kamaradclimber-gridmin 2014-05-10 01:56:27 +02:00
Torkel Ödegaard
5ad95a1c3e Merge branch 'influxdb' of github.com:pmenglund/grafana into pmenglund-influxdb 2014-05-10 01:41:25 +02:00
Torkel Ödegaard
de8d456089 Merge branch 'master' of github.com:torkelo/grafana 2014-05-10 01:40:23 +02:00
Torkel Ödegaard
07610a5f92 small change to influxdb template to support older versions of influxdb 2014-05-10 01:40:08 +02:00
Torkel Ödegaard
21b96068e4 Merge pull request #382 from ktoso/nanos-formatting
Added nanosecond y-scale formatting
2014-05-06 09:50:34 -07:00
Stefan Majer
c9df61c43c Quote timeseries names to be able to have special character such as @ in a seriename. 2014-05-06 08:42:49 +02:00
Stefan Majer
c1266abb98 Quote timeseries names to be able to have special character such as @ in a seriename. 2014-05-06 08:38:09 +02:00
Martin Englund
9dfb03aa0f use the influxdb built in time precision 2014-05-05 22:45:15 -07:00
Gregoire Seux
3a35dee0e3 Default to auto scaling for grid min setting
fixes #226
2014-05-05 09:33:45 +02:00
Torkel Ödegaard
f4568ef589 trying to get more unit tests working 2014-05-03 17:00:48 +02:00
Konrad 'ktoso' Malawski
f80871ce7e Added nanosecond y-scale formatting 2014-05-03 16:26:28 +02:00
Torkel Ödegaard
8fe4422d21 updated readme.md with new grafana organization urls 2014-05-01 15:00:56 +02:00
Torkel Ödegaard
c19fafa581 Improvement to series toggling, CTRL+MouseClick on series name will now hide all others (Closes #350) 2014-05-01 11:18:23 +02:00
Harald Kraemer
52e1f5273c Extracted multi-graphite query function, fixed loadRecursive
The new function in metricKeys generalizes what my loadAll
from the previous commit did, it takes a request and a
callback. The request is executed on each graphite installation
and the callback is executed for each result. This makes
implementing loadAll and loadRecursive almost as simple as
it was.
2014-04-30 13:13:51 +02:00
Torkel Ödegaard
2b5e974132 updated changelog with PR #369 2014-04-30 10:37:50 +02:00
Torkel Ödegaard
e3d7e3c195 Merge pull request #369 from jbripley/influxdb-columnname-escape
Change InfluxDB SQL generation template to wrap column names in quoutes
2014-04-30 10:33:47 +02:00
Joakim Bodin
11446b3e53 Change InfluxDB SQL generation template to wrap column names in quoutes
Since column names can contain dots or dashes, which will give syntax errors from InfluxDB API, unless wrapped in quoutes
2014-04-30 10:22:22 +02:00
Harald Kraemer
637c720de5 Modified metricKeys to handle multiple graphite sources.
This wasn't all too hard to change, I mostly changed the
single http get to multiple http gets, one for each data
source of type graphite.

It's still not a good idea to call this on the web
frontend, since the whole thing was working for about
20 - 30 minutes when I clicked it, so I'm not
committing my changes to settings.js or the view itself.
2014-04-30 09:40:06 +02:00
Torkel Ödegaard
0dae8f9977 removed unused function 'endsWithWildcard', fixes jshint error 2014-04-28 20:08:25 +02:00
Torkel Ödegaard
9c5674a076 Fixes to filters and the 'All' option. It now never uses '*' as value, but all options in a {node1, node2, node3} expression (Closes #228, Closes #359) 2014-04-28 19:58:25 +02:00
Torkel Ödegaard
35368442ec Merge pull request #356 from Tetha/master
Fixed an exception when adding a graphite function.
2014-04-28 12:09:49 +02:00