Commit Graph

32 Commits

Author SHA1 Message Date
Torkel Ödegaard
75c77a44c9 Merge branch 'master' of github.com:torkelo/grafana-private into pro
Conflicts:
	src/app/app.js
	src/app/controllers/all.js
	src/app/routes/all.js
	src/app/services/datasourceSrv.js
	src/test/test-main.js
2014-12-31 12:07:22 +01:00
Torkel Ödegaard
8268c65c57 Trying to organize code more around features than the standard controllers, services structure 2014-12-30 21:24:55 +01:00
Torkel Ödegaard
f9b0a01c74 restructuring 2014-12-30 21:08:56 +01:00
Torkel Ödegaard
0a4ccdcef2 moved all graphite code into features/graphite 2014-12-30 20:49:04 +01:00
Torkel Ödegaard
14080d1531 Merge remote-tracking branch 'origin/master' into pro
Conflicts:
	src/css/less/grafana.less
	src/test/test-main.js
2014-09-13 18:10:14 +02:00
Torkel Ödegaard
762dab618a Small change to datasourceSrv, if datasource is not found, return default datasource 2014-09-11 14:07:27 +02:00
Torkel Ödegaard
bb3b31829f Progress on template editor & new templating features 2014-08-27 15:54:30 +02:00
Torkel Ödegaard
647feb7b33 Progress on new filter/templating editor 2014-08-26 14:17:46 +02:00
Torkel Ödegaard
dac4954215 merged with oss 2014-08-16 08:56:02 +02:00
Torkel Ödegaard
ec2b4f584c some initial work on making it easy to add a custom datasource without modifing the original source, #701, #553 2014-08-15 19:12:25 +02:00
Torkel Ödegaard
eb6099a93f Began work on pro modification 2014-08-07 16:04:54 +02:00
Torkel Ödegaard
23c9f973cc Switch from underscore to lodash, #659 2014-08-07 14:35:28 +02:00
Torkel Ödegaard
b8ce61ae45 General architectural changes around datasources, unifying dashboard loading behind datasource abstraction, #630 2014-07-30 10:52:02 +02:00
Torkel Ödegaard
5a25b0885c added datasource filtering based on datasource abilities 2014-07-30 08:34:58 +02:00
Torkel Ödegaard
4e47447dec began work on ES annotation datasource, #201 2014-07-29 11:26:05 +02:00
Torkel Ödegaard
77bfd85e9e Changed all kibana words to grafana 2014-07-28 18:11:52 +02:00
Torkel Ödegaard
551b802d89 Annotation datasource redesign is done, Closes #608 2014-07-20 16:32:09 +02:00
Torkel Ödegaard
b5fb8b6d82 fixed jscs errors 2014-07-13 15:15:10 +02:00
Torkel Ödegaard
171c5aa50c began work on annotations redesign to easier support more annotation sources, #133, #394, #403 2014-07-13 15:01:20 +02:00
Torkel Ödegaard
9a53779b6c Default property that marks which datasource is default in config.js is now optional (Fixes #526) 2014-06-22 18:02:43 +02:00
Torkel Ödegaard
6885cea0fd Improvement and polish to the OpenTSDB query editor (Issue #492) 2014-06-14 11:38:27 +02:00
Torkel Ödegaard
ce8bdabab8 Adding JSCS (javascript style checker) 2014-06-07 07:05:42 +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
Torkel Ödegaard
dfd1d09641 added unit tests for filterSrv 2014-03-23 07:03:43 +01:00
Matt Page
30b62e172d Add an OpenTSDB datasource.
This adds support for querying OpenTSDB for metric data.
2014-03-18 12:21:40 -07:00
Torkel Ödegaard
bd0f694f6a small refactoring and jshint fix for datasourceFactory func 2014-03-04 22:01:25 +01:00
Torkel Ödegaard
c018b4bd6e fix for influxdb as default datasource, #103 2014-03-04 21:49:06 +01:00
Torkel Ödegaard
73dcd9e11a improvement to bar width 2014-03-02 13:26:08 +01:00
Torkel Ödegaard
e3f56f2645 refactoring of graphite panel to be more datasource agnostic, start of experimental influxdb support 2014-02-27 21:46:06 +01:00
Torkel Odegaard
605888bb78 finished refactoring of GraphiteDatasource to angular service and fixed jshint errors 2014-02-25 21:31:30 +01:00
Torkel Ödegaard
ef69d692ef Time is now sent in utc when time correction is set to utc #143 2014-02-25 17:48:13 +01:00
Torkel Ödegaard
36f56f3695 Closes #35, grafana now supports multiple graphite backends. Check config.sample for how to setup. In the general tab of the graphite panel you can change datasource 2014-02-15 13:46:36 +01:00