IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-13 09:05:45 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,702 Commits 5,454 Branches 554 Tags 1.9 GiB
23599814a3
Commit Graph

787 Commits

Author SHA1 Message Date
Torkel Ödegaard
bf25b9f443 Merge pull request #2896 from garymcleanhall/fix-grafana-on-microsoft-edge 
Removed spurious `</div>`, fixes Edge on Windows
 2015-10-08 21:29:23 +02:00
Torkel Ödegaard
3435aaea45 fixed failing unit test 2015-10-08 17:39:06 +02:00
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
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