IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-12 08:35:43 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,608 Commits 5,453 Branches 554 Tags 1.9 GiB
c95a991cb3
Commit Graph

4608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard
c95a991cb3 fix(panel/common): fix for query letters when importing old dashboards, fixes #2943 2015-10-16 11:58:44 -04:00
Torkel Ödegaard
c320e9d583 fix(annotations): fixed graphite annotations, broken by recent time handling changes, fixes #2947 2015-10-16 11:07:15 -04:00
Torkel Ödegaard
e507afc3d5 fix(panel): fix for firefox and placing cursor in text inputs when in panel fullscreen edit mode, fixes #2957 2015-10-16 10:10:39 -04:00
Torkel Ödegaard
e873574e8c fix(logging): fixed so that router_logging = true actually logs all http requests, fixes #2902 2015-10-10 17:55:15 -04:00
Torkel Ödegaard
d09bff9039 fixed failing jshint 2015-10-10 15:11:58 -04:00
Torkel Ödegaard
c0da52aac8 fix(share): fixed share panel image url, did not generate correct url when domain name contained word dashboards, fixes #2916 2015-10-10 14:38:22 -04:00
Torkel Ödegaard
c831369974 fix(influxdb): influxdb data source did not use right http abstraction for metric queries, fixes #2919 2015-10-10 11:46:00 -04:00
Torkel Ödegaard
f0a13b2a0d Merge pull request #2914 from anryko/master 
Fixed configuration example for Github OAuth team_ids.
 2015-10-10 16:26:28 +02:00
anryko
b68987dcde Fixed configuration example for Github OAuth team_ids. 2015-10-09 17:05:46 +02:00
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
9fc91b7aa1 fixed gofmt issue 2015-10-08 17:30:13 +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
318af9b418 small docs structure change, moved build from source into install section and CLA into project, and about into project 2015-10-06 10:38:19 +02:00
Torkel Ödegaard
0bcda4a2eb minor elasticsearch fix 2015-10-05 11:17:53 +02:00
Torkel Ödegaard
0db2d07a1a Merge pull request #2871 from mtanda/prometheus_time_fix 
fix prometheus time conversion
 2015-10-03 12:50:05 +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
bddcc6491a Merge pull request #2870 from ctdk/strip-format 
Add config option to strip (most) colors from console logs
 2015-10-01 22:31:21 +02:00
ctdk
d37e18fdcf Add config option to strip (most) colors from console logs 2015-10-01 13:16:23 -07: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
Torkel Ödegaard
f44eaae88a Merge pull request #2867 from juliusv/fix-prometheus-link 
Fix "Link to Prometheus" button for proxied Prometheus sources.
 2015-10-01 18:43:19 +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
Torkel Ödegaard
f0f791d226 Merge pull request #2859 from tmonk42/graphite_multiplySeries 
add graphite multiplySeries function
 2015-10-01 08:39:22 +02:00
Haneysmith, Nathan
7ca261e33e add graphite multiplySeries function 2015-09-30 11:18:47 -07:00