Commit Graph

1453 Commits

Author SHA1 Message Date
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
Torkel Ödegaard
035b5163fb Merge branch 'unsaved_changes_warning' (Closes #324) 2014-04-27 12:28:57 +02:00
Torkel Ödegaard
a1d5e26f6b Added onbeforeunload check to unsaved changes warning feature 2014-04-27 12:27:06 +02:00
Torkel Ödegaard
bdd2c9d033 More work on unsaved changes warning (Issue #324) 2014-04-27 12:22:38 +02:00
Torkel Ödegaard
8ad00faebc small progress on unsaved changes warning 2014-04-25 16:50:35 +02:00
Harald Kraemer
061bfffd4d Fixed an exception when adding a graphite function.
The error was that funcDef is just a string parsed from an event
like onMouseDown or something like that. This event is turned
into a function instance, and the function instance has
expected parameters and so forth. However, the number of
parameters was actually checked on the funcDef.
2014-04-25 16:48:17 +02:00
Torkel Ödegaard
bfb2376aa3 working on unsaved changes warning 2014-04-25 15:23:17 +02:00
Torkel Ödegaard
9e4656e43f New config setting for graphite datasource to control if json render request is POST or GET (Closes #345) 2014-04-24 17:58:34 +02:00
Torkel Ödegaard
c26926148c began work on unsaved changes warning when changing dashboard, Issue #324 2014-04-23 21:16:53 +02:00
Torkel Ödegaard
827e1846a8 Closes #333, New version availability check will now checks http://grafanarel.s3.amazonaws.com/latest.json if there is a new version. And the link now points to http://grafana.org/download 2014-04-23 09:05:10 +02:00
Torkel Ödegaard
2f58aa280c Review and small refactoring of PR #331 2014-04-22 13:08:14 +02:00
Torkel Ödegaard
66db99faf8 Merge branch 'feature/influxdb-add-where-conditions' of github.com:mavimo/grafana into mavimo-feature/influxdb-add-where-conditions 2014-04-22 12:38:15 +02:00
Torkel Ödegaard
0efafc50dc Increased resolution for graphite datapoints (maxDataPoints), now equal to panel pixel width. (Closes #5) 2014-04-22 12:01:51 +02:00
Marco Vito Moscaritolo
595aab4edf removed unrequired variable (error on merge from master) 2014-04-21 18:14:30 +02:00
Marco Vito Moscaritolo
02696c8bca better variable naming 2014-04-21 18:13:05 +02:00
Marco Vito Moscaritolo
01f3d728ef Added labels per series management 2014-04-21 18:07:55 +02:00
Marco Vito Moscaritolo
bba76cac4d Added conditions management 2014-04-21 18:07:24 +02:00
Marco Vito Moscaritolo
72ab721f22 Added where condiction operators 2014-04-21 18:06:13 +02:00
Marco Vito Moscaritolo
f98db943a5 Merge branch 'master' into feature/influxdb-add-where-conditions
Conflicts:
	src/app/partials/influxdb/editor.html
	src/app/services/influxdb/influxdbDatasource.js
2014-04-21 16:32:05 +02:00
Marco Vito Moscaritolo
f122da58c1 added support to coustom where conditions 2014-04-21 16:20:08 +02:00
Torkel Ödegaard
125db1777a influxdb editor: rawquery text input, changed from fixed pixel width to span10 class 2014-04-20 14:17:25 +02:00
Torkel Ödegaard
c592db4024 Merge branch 'influxdb-updates' of github.com:influxdb/grafana into influxdb-influxdb-updates 2014-04-20 13:59:31 +02:00
Torkel Ödegaard
02af2dbe73 Added rounding for graphites from and to time range filters
for very short absolute ranges (Fixes #320)
2014-04-18 16:06:55 +02:00
Torkel Ödegaard
b1bd04566e updated changelog 2014-04-17 22:36:12 +02:00
Torkel Odegaard
15288b0e84 version bump to 1.5.3 2014-04-17 22:27:19 +02:00
Torkel Ödegaard
dfaa529fa3 updated readme 2014-04-17 14:33:09 +02:00
Torkel Ödegaard
ef54bb1b7c Merge pull request #323 from magicrobotmonkey/slideshow_leak
unbind resize event during slideshow
2014-04-17 09:52:48 +02:00
Todd Persen
b3e459863e Add support for multiple hosts (with retries) and raw queries. 2014-04-16 09:54:25 -04:00
Aaron Bassett
ada56ea8ce unbind resize event during slideshow 2014-04-16 09:52:29 -04:00
Torkel Ödegaard
8ca589cdf5 Support for async scripted dashboards, and accesss to jquery, window & document, Closes #274) 2014-04-16 14:57:35 +02:00
Torkel Odegaard
390c4eed7e Revert "Merge pull request #310 from roidelapluie/master"
This reverts commit 9fc93e285c, reversing
changes made to 30bf838065.
2014-04-15 19:56:35 +02:00
Torkel Ödegaard
9fc93e285c Merge pull request #310 from roidelapluie/master
Reload filters when loading page
2014-04-15 19:50:46 +02:00
Julien Pivotto
1f417f0606 Reload filters when loading page
This commit refreshes the dynamic filters when loading page.
2014-04-14 14:47:39 +02:00
Torkel Ödegaard
30bf838065 added smartSummarize graphite function definition 2014-04-14 08:17:42 +02:00
Torkel Ödegaard
0019101f0e clarified timezoneOffset setting 2014-04-13 15:01:06 +02:00
Torkel Ödegaard
75b2e383c2 Merge branch 'auto_tz' of github.com:magicrobotmonkey/grafana into magicrobotmonkey-auto_tz 2014-04-13 13:45:08 +02:00
Torkel Ödegaard
b5830e0cde Merge pull request #307 from awilliams/patch-1
Fixes documentation typo
2014-04-11 16:33:35 +02:00
Adam Williams
e9dcf0e00b Fixes documentation typo 2014-04-11 15:22:20 +02:00
Torkel Ödegaard
ccd5c01d91 Merge pull request #306 from cruatta/master
Grafana needs hideLegend=false in graphite urls when show legend is selected for Graphite PNG
2014-04-11 11:25:30 +02:00
Cameron Ruatta
2ea3f7a558 Changing behavior to always obey the show legend option in grafana. without hideLegend=false, grafana defaults to the graphite behavior of hiding the legend at (default 10) X number of series. Also should be checking scope.panel.legend.show. 2014-04-10 14:10:29 -07:00
Torkel Ödegaard
993a2daccc fixed failing unit test, added 2 more for setTime & auto refresh behavior 2014-04-10 12:44:19 +02:00
Torkel Ödegaard
541baac49e Closes #282, Disable auto refresh zooming in (every time you change to an absolute time range), refresh will be restored when you change time range back to relative 2014-04-10 12:28:06 +02:00
Torkel Ödegaard
d69b04e9ed Closes #294, Browser page title is now Grafana - {{dashboard title}} 2014-04-10 12:12:15 +02:00
Torkel Ödegaard
78fab41310 Merge pull request #303 from jaimegago/master
Update README.md
2014-04-10 08:58:36 +02:00
Jaime Gago
4502ed068d Update README.md
Caveat about using "*" in CORS
2014-04-09 12:56:31 -07:00
Torkel Ödegaard
5495e0f96a Fixes #302, year dates in changelog was 2013, now corrected to 2014, thx LordFPL for spotting this 2014-04-09 12:36:35 +02:00
Torkel Ödegaard
60a8fe31f1 Fixes #297, filter remove fix 2014-04-08 20:51:26 +02:00