IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-13 00:55:47 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,852 Commits 5,451 Branches 554 Tags 1.9 GiB
9485e8cfee
Commit Graph

886 Commits

Author SHA1 Message Date
Torkel Ödegaard
04eefb8480 fix(timepicker): fixed issue with timepicker and auto refresh and entering manual time when timepicker dropdown is open, fixes #2897 2015-10-08 15:35:17 +02:00
Torkel Ödegaard
8789be7671 Merge branch 'master' of github.com:grafana/grafana 2015-10-08 13:30:11 +02:00
Torkel Ödegaard
fe46410c31 Merge branch 'cloudwatch' 2015-10-08 13:09:27 +02:00
Torkel Ödegaard
aef644bd21 feat(cloudwatch): final polish to the cloudwatch editor, closes #684 2015-10-08 13:09:15 +02:00
Torkel Ödegaard
df4d5ea8a6 Merge pull request #2898 from zachm/ztm_patch_missing_downsample 
Fix missing downsampling name in kairos plugin
 2015-10-08 12:05:20 +02:00
Torkel Ödegaard
c34c3ac845 feat(cloudwatch): refactoring and editor improvements, #684 2015-10-08 11:37:47 +02:00
Zachary Musgrave
a94720878b Fix missing downsampling name in kairos plugin 2015-10-07 16:43:40 -07:00
Gary McLean Hall
59a2042a31 Removed spurious </div>, fixes Edge on Windows 2015-10-08 00:14:00 +01:00
Torkel Ödegaard
f680c15283 fix(snapshot): fixed issue with timepicker / time display when viewing snapshot, fixes #2892 2015-10-07 13:07:30 +02:00
Torkel Ödegaard
f11785001c docs: minor fix 2015-10-06 17:51:22 +02:00
Torkel Ödegaard
106fe4854f Merge branch 'prometheus' of github.com:grafana/grafana 
Conflicts:
	pkg/models/datasource.go
	public/app/plugins/datasource/prometheus/datasource.js
	public/app/plugins/datasource/prometheus/partials/query.editor.html
	public/app/plugins/datasource/prometheus/queryCtrl.js
 2015-10-06 16:36:58 +02:00
Torkel Ödegaard
44d377b810 feat(prometheus): refactoring and polish of the prometheus editor removing unused/uneeded code 2015-10-06 14:34:44 +02:00
Torkel Ödegaard
a2bf3e056d Merge branch 'prometheus' 2015-10-06 14:10:06 +02:00
Torkel Ödegaard
2d722e26de fix(cloudwatch): fixed test datasource, broken due to some function name changes 2015-10-06 14:08:48 +02:00
Torkel Ödegaard
182e079d25 Merge branch 'master' into cloudwatch 2015-10-06 14:08:10 +02:00
Torkel Ödegaard
0bcda4a2eb minor elasticsearch fix 2015-10-05 11:17:53 +02:00
Ivan Babrou
0dc0e03c4c Add suggest_tagk() and suggest_tagv() to OpenTSDB datasource (#2840) 2015-10-04 12:54:43 +01:00
Torkel Ödegaard
3d52095765 feat(cloudwatch): restored dimension keys lookup 2015-10-02 20:25:28 +02:00
Torkel Ödegaard
0912cec0e5 feat(cloudwatch): contining work on moving hard coded stuff to backend and cleaning up code, #684 2015-10-02 11:54:35 +02:00
Torkel Ödegaard
180ba33ac8 feat(cloudwatch): refactoring and cleanup of backend code, started moving hard coded stuff in the frontend to the backend, changed name of metricFind queries region() -> regions() , and namespace() -> namespaces() to be more consistent with the others, #684 2015-10-02 11:10:21 +02:00
Torkel Ödegaard
04f4454974 feat(cloudwatch): lots of code refactoring and cleanup, #684, dimension values lookup works but seems to return all dimension values no matter what dimension key you select, removed strange formating of template dimension values query, should not return key value pair but only the dimension value 2015-10-02 09:04:46 +02:00
Torkel Ödegaard
91285baea5 feat(cloudwatch): fixed failing unit tests 2015-10-02 07:32:21 +02:00
Torkel Ödegaard
875d80aa72 feat(cloudwatch): refactoring cloudwatch datasource code, #684 2015-10-02 07:25:54 +02:00
Mitsuhiro Tanda
5e19fdb492 fix prometheus time conversion 2015-10-02 12:10:11 +09:00
Torkel Ödegaard
af8d12124a feat(cloudwatch): code refactoring and cleanup, trying to rewrite so the code uses promises instead of ccallbacks, #684 2015-10-01 21:20:52 +02:00
Torkel Ödegaard
5e34823e7c Merge pull request #2858 from mtanda/prometheus 
fix unmatched tag
 2015-10-01 18:47:21 +02:00
Julius Volz
3cc69112c1 Fix "Link to Prometheus" button for proxied Prometheus sources. 2015-10-01 18:23:29 +02:00
Torkel Ödegaard
205d4232b9 feat(cloudwatch): only support proxy mode, can remove frontend aws-sdk lib 2015-10-01 17:38:55 +02:00
Torkel Ödegaard
3c6a06a327 feat(cloudwatch): moved specs into plugins dir 2015-10-01 17:00:41 +02:00
Torkel Ödegaard
057b533a39 Merge branch 'master' into cloudwatch 2015-10-01 16:46:59 +02:00
Torkel Ödegaard
b774b91b92 Merge branch 'cloudwatch' of https://github.com/mtanda/grafana into cloudwatch 
Conflicts:
	public/test/specs/cloudwatch-datasource-specs.js
 2015-10-01 16:41:54 +02:00
Torkel Ödegaard
7dc923a292 fix(timepicker): fixed displaying of customk time ranges, #2861 2015-10-01 16:36:38 +02:00
Haneysmith, Nathan
7ca261e33e add graphite multiplySeries function 2015-09-30 11:18:47 -07:00
Mitsuhiro Tanda
d0b744387b fix unmatched tag 2015-10-01 01:33:13 +09:00
Jimmi Dyson
0c222c4e8c Fix Prometheus test connection 2015-09-30 16:44:24 +01:00
Jimmi Dyson
b90e4057ba Convert prometheus specs to typescript 2015-09-30 15:52:15 +01:00
Jimmi Dyson
67f253830f Add Prometheus metricFindQuery unit tests 2015-09-30 14:20:58 +01:00
Jimmi Dyson
2e291d73aa jshint fixes 2015-09-30 12:46:44 +01:00
Jimmi Dyson
daee7970f3 Add label_values query to get labels on a particular metric 2015-09-30 12:29:53 +01:00
Jimmi Dyson
cf0748895e Prometheus template params fixes 2015-09-29 17:07:11 +01:00
Jimmi Dyson
6e66b8a0fa Add prometheus datasource 2015-09-29 17:07:11 +01:00
Torkel Ödegaard
d9d3da4def Merge branch 'prometheus-datasource' of https://github.com/jimmidyson/grafana into prometheus 2015-09-29 08:06:16 +02:00
Mitsuhiro Tanda
be6cb24e10 fix cloudwatch test 2015-09-29 13:26:04 +09:00
Mitsuhiro Tanda
1a63d9eb3b reactivate cloudwatch test 2015-09-29 12:37:34 +09:00
Jimmi Dyson
bf98cfeadc Add prometheus datasource 2015-09-28 23:15:33 +01:00
Torkel Ödegaard
8a39b32b5c refactor: moved elasticsearch specs to plugin folder and to typescript 2015-09-28 16:28:19 +02:00
Torkel Ödegaard
7d2646f60a refactor: moved influxdb specs to plugins folder 2015-09-28 15:51:02 +02:00
Torkel Ödegaard
1a8bc1dd60 fix(dashbard save as): fixed wonky behavior in save as modal, cursor to the end randomly, fixes #2837 2015-09-28 15:26:56 +02:00
Torkel Ödegaard
7e434fc019 refactor: moved graphite specs into plugins directory 2015-09-28 15:23:53 +02:00
Torkel Ödegaard
49d57cf596 feat(cloudwatch): uncommented tests, but they do not seemt to execute 2015-09-28 14:16:03 +02:00
Torkel Ödegaard
8dfbc55851 Merge branch 'cloudwatch' of https://github.com/mtanda/grafana into cloudwatch 2015-09-28 13:44:30 +02:00
Torkel Ödegaard
3cbfe21b2c Merge branch 'master' into cloudwatch 2015-09-28 13:43:03 +02:00
Torkel Ödegaard
cb7424ce5e fix(playlist ui): minor polish / fix to playlist ui, fixes #2831, other minor css / markup fixes 2015-09-28 11:53:49 +02:00
Torkel Ödegaard
a567939f78 fix(elasticsearch): quote variable value in lucene variable mulit format, fixes #2828 2015-09-28 11:28:08 +02:00
Torkel Ödegaard
a3748d4b97 fix(singestat): fixed missing sparklines, caused by recent changes to time range handling, fixes #2815 2015-09-28 09:28:43 +09:00
Torkel Ödegaard
b80dc92ca5 Merge branch 'master' of github.com:grafana/grafana 2015-09-27 12:09:45 +02:00
Torkel Ödegaard
57dee76c88 feat(elasticsearch): templating terms query should have size set to zero to return all terms, fixes #2827 2015-09-27 12:09:12 +02:00
Mitsuhiro Tanda
01ec8d0bcb fix cloudwatch time error 2015-09-26 02:33:52 +09:00
Mitsuhiro Tanda
d09e8a12b4 fix jshint error 2015-09-26 02:33:52 +09:00
Mitsuhiro Tanda
5dd64b97d2 refactor 2015-09-26 02:33:52 +09:00
Mitsuhiro Tanda
9600b1f103 add ebs_volume_ids() for templating 2015-09-26 02:33:51 +09:00
Mitsuhiro Tanda
ca9861e749 fix cloudwatch config editor 2015-09-26 02:33:51 +09:00
Torkel Ödegaard
38bf07f4da Merge pull request #2817 from utkarshcmu/axes 
Single stat panel throws warning on multiple series result.
 2015-09-25 10:23:10 +02:00
ubhatnagar
026fffa19f Singlestat Panel Error in InspectCtrl. 2015-09-24 23:13:05 +05:30
Torkel Ödegaard
9da5ef3cbf fix(singestat): fixed missing sparklines, caused by recent changes to time range handling, fixes #2815 2015-09-24 11:36:25 +02:00
ubhatnagar
ea7fe0c761 Single stat panel throws warning on multiple series result. 2015-09-24 09:40:09 +05:30
Torkel Ödegaard
25d7b8d08d feat(cloudwatch): resumed work on cloudwath datasource, #684, #2445 2015-09-23 21:13:19 +02:00
Torkel Ödegaard
f4e3c0a2e4 Revert "poc: some tests for new influxdb editor" 
This reverts commit 075d01820c.
 2015-09-23 20:57:29 +02:00
Torkel Ödegaard
81ebaae12e feat(opentsdb): templating, added default match format option, now new variables with opentsdb datasource will automatically use the new pipe format, #2808 2015-09-23 11:18:56 +02:00
Torkel Ödegaard
71984b25e9 Merge pull request #2808 from utkarshcmu/master 
Implemented Opentsdb MultiSelect Templating.
 2015-09-23 11:16:01 +02:00
Torkel Ödegaard
4100c9881a fix(panel): fixed selecting text in fullscreen edit mode 2015-09-23 10:03:30 +02:00
Torkel Ödegaard
075d01820c poc: some tests for new influxdb editor 2015-09-23 09:58:36 +02:00
ubhatnagar
6f43cbf665 Added unit tests for all and multi format options. 2015-09-23 13:24:59 +05:30
ubhatnagar
866f48f92d Added pipe in All Format list. 2015-09-23 13:12:35 +05:30
Torkel Ödegaard
2790e4e819 change(influxdb): removed derivative functions from aggregator list 2015-09-23 09:40:53 +02:00
Torkel Ödegaard
8bb2b5e290 fix(influxdb): have alias field visible when using raw query mode, fixes #2803 2015-09-23 09:34:05 +02:00
Torkel Ödegaard
5c55617585 refactor: polishing OpenTSDB related PR #1646, added caching of aggregators request so only one call is made 2015-09-23 09:17:37 +02:00
Torkel Ödegaard
0e0caabf7d Merge branch 'master' of https://github.com/mxk1235/grafana into mxk1235-master 2015-09-23 09:08:29 +02:00
ubhatnagar
024a319512 Implemented Opentsdb MultiSelect Templating. 2015-09-23 11:22:57 +05:30
Torkel Ödegaard
f632b3b029 feat(elasticsearch): added new templating all format and muli format named , also added automatic setting of correct all and multi format depending on data source, closes #2696 2015-09-22 14:29:41 +02:00
Torkel Ödegaard
b37f9a7db0 fix(graphite): minor fix to query editor when using summarize function with no metric segments, only series ref, fixes #2788 2015-09-22 13:32:28 +02:00
Torkel Ödegaard
6f9c306260 fix(singlestat): fixed usage of template variable in drilldown link for singlestat, fixes #2787 2015-09-22 12:48:03 +02:00
Torkel Ödegaard
c369350ca7 Merge branch 'master' of github.com:grafana/grafana 2015-09-22 09:32:13 +02:00
Torkel Ödegaard
bc3c394210 feat(elasticsearch): worked on elasticsearch templating support, #2696 2015-09-22 09:31:58 +02:00
ubhatnagar
e49bb1ccc0 Fixed #2798. Removed unused components. 2015-09-22 12:16:10 +05:30
Torkel Ödegaard
0ef8e086a2 fixed(share modal): fixed issue with sharemodal introduced with recent change to time handling, #2791 2015-09-22 07:32:47 +02:00
Torkel Ödegaard
63665dccae fix(grafana datasource): fixed the built in test data source, fixes #2795 2015-09-22 07:12:36 +02:00
Torkel Ödegaard
792b194d0e feat(elasticsearch): finished work on adding support for filters aggregate, you can now split series by query using group by filters, closes #2785 2015-09-21 20:29:05 +02:00
Torkel Ödegaard
e694a74c9d feat(elasticsearch): work on supporting filters aggregate, #2785 2015-09-21 19:23:18 +02:00
Torkel Ödegaard
9de016bfe3 feat(elasticseach): alias and lucene query fields are now visible/usable when using raw json query, #1034 2015-09-21 12:07:03 +02:00
Torkel Ödegaard
24bff6e04d ui(dashboard cog icon): minor change to PR #2772 that adds tooltip to cog icon 2015-09-21 11:29:14 +02:00
Torkel Ödegaard
cdab0d208e Merge branch 'master' of https://github.com/utkarshcmu/grafana into utkarshcmu-master 2015-09-21 11:16:50 +02:00
ubhatnagar
00c89b8354 Removed .jshintrc statement, implemented manage dashboard tooltip. 2015-09-21 08:09:34 +05:30
Torkel Ödegaard
fb767f5680 change: removed drilldown links from extended panel menu 2015-09-19 15:59:29 +02:00
Torkel Ödegaard
c7d22aafd2 feat(drilldown link): better access to drilldown links directly by clicking the external link icon in panel header, fixes #1575 2015-09-19 15:53:48 +02:00
Torkel Ödegaard
b5f237a69b fix(graph): minor fix for hover tooltip when combined with a single series using stepped lines, fixes #2754 2015-09-19 15:20:53 +02:00
Torkel Ödegaard
b4093ccf59 fix(graphite): minor fix to editor, add function dropdrop extended above page, fixes #1152 2015-09-19 14:58:52 +02:00
Torkel Ödegaard
2f68687de9 feat(timepicker2): temporarily removed the the option to define custom quick range, will have to be part of future issue, closes #2761 2015-09-19 12:20:24 +02:00
Torkel Ödegaard
86f4907cc4 feat(panel fullscreen): completly changed how the fullscreen view/edit works, no longer uses css fixed position, yay, closes #2779 2015-09-19 11:40:51 +02:00
Torkel Ödegaard
bffb795d7a feat(timepicker): small style change for timepicker 2015-09-19 10:54:17 +02:00
Torkel Ödegaard
c21cffa6d4 fix(timepicker): UTC now works in all scenarios I can think of, manual edit, date picker edit, #2761 2015-09-18 21:01:13 +02:00
Torkel Ödegaard
96b0e70ddd feat(timepickerv2): fixed lots of minor issues and updated kairosdb and opentsdb data sources to work with the new date formats 2015-09-18 15:06:08 +02:00
Torkel Ödegaard
febe56b062 feat(timepicker): fixed zoomout 2015-09-18 14:04:53 +02:00
Torkel Ödegaard
f5e6722826 feat(timepickerv2): more work on new timepicker, now absolute time mixed with relative time works, yesterday, this day last week, etc now work 2015-09-18 13:54:31 +02:00
Torkel Ödegaard
cea13b1823 feat(timepicker2): moved to controllerAs and bindToController for timepicker component 2015-09-18 12:41:32 +02:00
Torkel Ödegaard
3d85e85f29 fix(events): fixed handling of onAppEvents when used from rootScope, must supply localscope, can now be used in isolate scope scenarios 2015-09-18 12:15:06 +02:00
ubhatnagar
923df8244b Search Dashboard Panel will hide if 'Manage Dashboards' is clicked. 2015-09-18 02:30:02 -07:00
Torkel Ödegaard
69db9e0d45 feat(timepickerV2): absolute time / calendar picker works, #2761 2015-09-18 11:01:37 +02:00
Torkel Ödegaard
a8a94ef87b Merge branch 'master' into timepicker2 2015-09-18 10:36:50 +02:00
Torkel Ödegaard
f93215f4ec feat(timepicker2): more progress 2015-09-18 10:36:47 +02:00
ubhatnagar
9af460600d Fixed Indentation and Grunt run. 2015-09-18 00:50:55 -07:00
ubhatnagar
e1576b7131 Added Manage Dashboard Tooltip, hides when clicked. 2015-09-18 00:45:29 -07:00
Torkel Ödegaard
2a52d9bdf6 feat(timepicker2): more work on new timepicker 2015-09-18 08:17:19 +02:00
Torkel Ödegaard
ebf49d0668 Merge pull request #2771 from decbis/maxSeries-func-for-groupByNode 
Added maxSeries option for groupByNode Graphite function
 2015-09-18 08:16:46 +02:00
Mike Kobyakov
5d516592d9 Merge remote-tracking branch 'upstream/master' 2015-09-17 23:07:52 -07:00
Eugen Dinca
7dc2b36413 Added maxSeries option for groupByNode function 2015-09-17 16:50:09 -04:00
Torkel Ödegaard
5eefa36111 feat(timepickerv2): big progress on new design of new timepicker, #2761 2015-09-17 22:44:59 +02:00
Torkel Ödegaard
a30f73fe36 feat(timepicker): more work on getting new time formats to work in all data sources 2015-09-17 12:40:04 +02:00
Torkel Ödegaard
1a9c52e17f feat(timepicker): lots of big changes, moving to datemath from kbn.parseDateMath, moving to moment dates instead of native javascript dates 2015-09-17 11:21:38 +02:00
Torkel Ödegaard
5ad38ee9f8 feat(timepicker2): fixed timesrv specs 2015-09-17 09:57:59 +02:00
Torkel Ödegaard
4c79591403 fix(graphite): removed debug comment 2015-09-17 09:45:53 +02:00
Torkel Ödegaard
a9812167d7 feat(timepicker2): worked on more rich time range support 2015-09-17 09:44:51 +02:00
Torkel Ödegaard
a0a98cb035 feat(timepicker2): working on richer timepicker options 2015-09-16 19:49:05 +02:00
Liu Yubao
4fccfbf543 increase limit to lookup unique metric tag values 
Default limit is 25 which is too small. Considering currently the
/api/search/lookup query isn't narrowed down by selected tag
keys and values (see https://github.com/grafana/grafana/pull/1433), 
the limit is set to 3000, this should be fine because people rarely
create new graph panel.
 2015-09-17 01:36:36 +08:00
Liu Yubao
62ae80eeae deduplicate tag value suggestions for OpenTSDB 2015-09-17 01:25:28 +08:00
Torkel Ödegaard
d705108be5 feat(timepicker2): added date math tests 2015-09-16 18:48:41 +02:00
Torkel Ödegaard
3912eb7b26 Merge branch 'master' into timepicker2 2015-09-16 17:03:08 +02:00
Torkel Ödegaard
1f959272c5 feat(migration): added back support to import old dashboard from from Elasticsearch 2015-09-16 16:28:41 +02:00
Torkel Ödegaard
4ffa26cf2c feat() started work on more feature rich time picker 2015-09-15 13:23:36 +02:00
Torkel Ödegaard
2b95cd5081 refactor: moving routes into core, improved bundle loader 2015-09-15 08:53:06 +02:00
Torkel Ödegaard
5545cdbf4d refactor: improving structure, moving things into a core module 2015-09-15 08:17:40 +02:00
Torkel Ödegaard
9dec50832d refactor: refactoring app boot up and core structure 2015-09-14 22:54:00 +02:00
Torkel Ödegaard
de753bf330 fix(build): fixed issue with ngAnnotate not including files in core/*, fixes #2733 2015-09-14 09:33:26 +02:00
Torkel Ödegaard
1900c81d9f tech(nodejs upgrade): upgraded to nodejs 4.0 for grunt build 2015-09-13 12:13:47 +02:00
Torkel Ödegaard
9db6f82628 refactor: finished timepicker to typescript and directive refactor 2015-09-12 12:52:50 +02:00
Torkel Ödegaard
d96a6a59ee refactor: moved timepicker from a simple panel to component, removed simple panel directive 2015-09-12 11:49:27 +02:00
Torkel Ödegaard
7535677ed4 fix(build): fixed failing tslint test 2015-09-11 21:04:02 +02:00
Torkel Ödegaard
812e4c7cd4 refactor: moved array join directive to typecrtipt 2015-09-11 10:54:56 +02:00
Torkel Ödegaard
85baae1ebd feat(influxdb): added back fill option to editor, forgot to add it in the new updated query editor 2015-09-11 10:42:50 +02:00
Torkel Ödegaard
8174b9f041 fix(tests): fixed failling backend test 2015-09-11 08:58:45 +02:00
Torkel Ödegaard
286b4c0e46 Merge branch 'typescript' 2015-09-11 08:01:11 +02:00
Torkel Ödegaard
166a3c4d64 tech(typescript): added tslint to default task 2015-09-11 08:00:13 +02:00
Torkel Ödegaard
d4a701aad0 tech(typescript): more work on typescript 2015-09-11 07:47:00 +02:00
Torkel Ödegaard
84371f03b5 tech(typescript): more testing and migration 2015-09-10 16:47:38 +02:00
Torkel Ödegaard
20407bca89 tech(typescript): converted signup controller to typescript 2015-09-10 16:21:57 +02:00
Torkel Ödegaard
dceec44671 removed tsconfig 2015-09-10 14:36:05 +02:00
Torkel Ödegaard
da832368f0 dev building and optimized builds work 2015-09-10 12:42:24 +02:00
Torkel Ödegaard
abac8bccc6 tech(typescript): its looking good 2015-09-10 11:26:40 +02:00
Torkel Ödegaard
82061c7c3b experiments 2015-09-09 20:37:27 +02:00
Torkel Ödegaard
a8197df1c1 more experiments for mixing javascript and typescript 2015-09-09 19:34:24 +02:00
Torkel Ödegaard
005e1e002b more playing around with typescript 2015-09-09 17:40:52 +02:00
Torkel Ödegaard
eaa061d90c cleanup(): removed old influxdb editor partial 2015-09-09 14:18:56 +02:00
Torkel Ödegaard
1ab374008f feat(influxdb): completed work on new influxdb query editor, now supports #2708, #2647, #2599 2015-09-09 14:17:55 +02:00
Torkel Ödegaard
8c9d551826 feat(influxdb): you can now change group by time iunterval on per query basis, #2647 2015-09-09 13:48:57 +02:00
Torkel Ödegaard
c4c3f9dc1f feat(influxdb): more work on changing the influxdb editor to support better aliasing and interval options, #2647, #2599 2015-09-09 13:39:45 +02:00
Torkel Ödegaard
5b722deb39 feat(influxdb): began work on changing the influxdb editor to support better aliasing and interval options, #2647, #2599 2015-09-09 11:59:02 +02:00
Torkel Ödegaard
b61b7f0c3b fix(influxdb): fixed editor bug introduced in recent commit 2015-09-09 11:05:49 +02:00
Torkel Ödegaard
3c40310e9b tech(typescript): testing for how to migrate to typescript 2015-09-09 09:57:06 +02:00
Torkel Ödegaard
3e9e34afb8 feat(annotations): polished up the annotation editor tabs, similar to recent commits for templating editor 2015-09-08 16:59:39 +02:00
Torkel Ödegaard
26d8a041ef fix(templating): updated templating UI and tab behavior, now edit tab is not visible when not actually editing an existing var, fixes #2679 2015-09-08 15:54:08 +02:00
Torkel Ödegaard
fad1d4cf98 feat(organization): added update org address to http api and to org details settings view, closes #2672 2015-09-08 14:22:44 +02:00
Torkel Ödegaard
daf64421f2 fix(api): Added error handling to create and update org http apis and sql update handlers, now checks for org name taken scenarios and returns correct http error code and message, fixes #2686 2015-09-08 13:06:18 +02:00
Torkel Ödegaard
41154d6d11 fix(elasticsearch): fixed series naming & aliasing when using field for extended_stats and percentiles 2015-09-08 10:08:27 +02:00
Torkel Ödegaard
9904d01958 fix(unit test): trying to fix failing unit test due to timezone different on build server 2015-09-08 09:50:50 +02:00
Torkel Ödegaard
212a8ad6a6 Merge branch 'master' of github.com:grafana/grafana 2015-09-08 09:18:03 +02:00
Torkel Ödegaard
f2c518ba24 Merge branch 'elastic_ds' 
Conflicts:
	public/app/plugins/datasource/influxdb/queryCtrl.js
 2015-09-08 09:17:34 +02:00
Torkel Ödegaard
f8b61a4ebe changelog(): added #1034 to changelog 2015-09-08 09:16:41 +02:00
Torkel Ödegaard
35cc3837a0 feat(elasticsearch): more work on alias pattern, #1034 2015-09-08 09:10:26 +02:00
Torkel Ödegaard
572a80d1d1 feat(elasticsearch): metric response handling and processsing now supports alias patterns, {{term field name}} and {{metric}} now works, #1034 2015-09-07 23:15:49 +02:00
Torkel Ödegaard
2aa695fb66 feat(elasticsearch): refactoring elasticsearch response handling to support series alias patterns 2015-09-07 20:00:27 +02:00
Torkel Ödegaard
f361f324da feat(elasticsearch): more polish to editor, made interval configurable per query, #1034 2015-09-07 16:35:40 +02:00
Torkel Ödegaard
3999a3caa2 feat(elasticsearch): extended stats like std deviation now works, and sigma option as well, added unique count (cardinality as well, #1034 2015-09-07 13:13:27 +02:00
Torkel Ödegaard
efc3def7f2 feat(elasticsearch): small refactoring and polish 2015-09-07 09:36:56 +02:00
Torkel Ödegaard
6c304924f7 feat(elastic_ds): moving time field name to dataasource option, it is no longer specified for each query and date_histogram 2015-09-07 08:57:46 +02:00
Torkel Ödegaard
f90714f8fe feat(elasticsearch): changed default sort to asc 2015-09-06 16:11:01 +02:00
Torkel Ödegaard
0960360b35 feat(elasticsearch): added support for index time based patterns, #1034 2015-09-06 16:09:42 +02:00
Torkel Ödegaard
8db47e335f fixed jshint errors 2015-09-06 14:45:12 +02:00
Torkel Ödegaard
c609f67e16 fixed broken editors because of some recent refactorings 2015-09-06 14:29:28 +02:00
Torkel Ödegaard
14cb2b0143 began work on support index time patterns 2015-09-06 12:58:53 +02:00
Torkel Ödegaard
b24c539206 feat(elasticsearch): began work on supporting extended stats metric agg, it gives you standard deviation and more 2015-09-05 20:22:54 +02:00
Torkel Ödegaard
52eeefa6d9 feat(elasticsearch): fields are fetch from mapping instead of docs, you can enter custom value in field options, other fixes, #1034 2015-09-05 19:55:58 +02:00
Torkel Ödegaard
f942ec952e feat(elasticsearch): worked on percentiles metric aggregator in editor and in elasticsearch response processing 2015-09-05 18:31:42 +02:00
Torkel Ödegaard
3e9aca3ed4 feat(elasticsearch): terms aggregation options are working, things are starting to come together, #1034 2015-09-05 15:41:04 +02:00
Torkel Ödegaard
2d832e10b0 feat(elasticsearch): term metric filters are starting to work! like terms aggregation with top 5, order by metric 1 desc, where metric 1 is maybe average of @load 2015-09-05 12:51:05 +02:00
Torkel Ödegaard
f1e995ec79 feat(elasticsearch): added bucket agg id concept 2015-09-05 12:24:14 +02:00
Torkel Ödegaard
756ec8ccd7 feat(elasticsearch): close to getting group by term options ui working 2015-09-05 10:48:11 +02:00
Torkel Ödegaard
c48f24d269 feat(editor): more work on editor components, extracing things and making reusable directives 2015-09-05 10:14:21 +02:00
Torkel Ödegaard
0d2e13549a feat(editor): thing are starting to work again 2015-09-05 09:05:09 +02:00
Torkel Ödegaard
f9ce9bdcec feat(editor): refactoring and making new editor abstractions 2015-09-05 08:07:40 +02:00
Torkel Ödegaard
e339dbf473 feat(elasticsearch): so much work on new editor, its pretty broken right now, but when it is done it is going to be amazing 2015-09-04 22:10:56 +02:00
Torkel Ödegaard
f27f028d44 Merge pull request #2676 from jd/master 
doc: fix link to basic concepts
 2015-09-04 17:34:01 +02:00
Julien Danjou
697aaf7e70 partials: fix closing markup in datasourceHttpConfig 2015-09-04 17:14:27 +02:00
Torkel Ödegaard
cc1e3d0101 feat(elasticsearch): groundwork for a much more sophisticated elasticsearch query editor 2015-09-04 16:05:47 +02:00
Torkel Ödegaard
9daa3997e9 feat(elasticsearch): time field selector now works, #1034 2015-09-04 11:17:52 +02:00
Torkel Ödegaard
83930ec9d1 feat(elasticsearch): raw queries work, more unit tests and polish, #1034 2015-09-04 09:41:23 +02:00
Torkel Ödegaard
5beced458c fix(): fixed problems in last commit 2015-09-04 07:41:50 +02:00
Torkel Ödegaard
ead451a979 feat(influxdb): More alias options, can now use syntax to reference part of a measurement name (seperated by dots), closes #2599 2015-09-04 07:40:28 +02:00
Torkel Ödegaard
97d42991a7 fix(graph tooltip): fixed graph tooltip when stacking and one series is not stacked (via override), fixes #2670 2015-09-03 21:18:05 +02:00
Torkel Ödegaard
cd6bdc1a78 fix(influxdb): fixed influxdb template var filter suggestion, fixes #2666 2015-09-03 20:53:20 +02:00
Torkel Ödegaard
977f538420 feat(elasticsearch): lots of work on elasticsearch metrics query editor, #1034 2015-09-03 16:35:11 +02:00