Commit Graph

718 Commits

Author SHA1 Message Date
Torkel Ödegaard
8526230b59 fix(influxdb_08): fixed influxdb 08 query editor issue, fixes #3009 2015-10-22 16:53:34 -04:00
Torkel Ödegaard
9d04a4c4f0 Merge branch 'master' of github.com:grafana/grafana 2015-10-22 16:23:31 -04:00
Torkel Ödegaard
ae93f2b936 fix(elasticsearch): fixed proper json escaping for lucene query, fixes #2981 2015-10-22 16:23:21 -04:00
Torkel Ödegaard
0b28db7fae Merge pull request #3005 from felixbarny/elastic_ds_min_interval
Ability to set a low limit for Elasticsearch date histogram interval
2015-10-22 12:35:23 -04:00
Torkel Ödegaard
87715d6231 fix(solo panel): fixed solo panel view gray bottom for rendered image and embedd iframe scenarios, fixes #3004 2015-10-22 12:33:42 -04:00
Torkel Ödegaard
ce5b4089b5 Merge branch 'new-units' of https://github.com/counsyl/grafana into counsyl-new-units 2015-10-22 12:19:21 -04:00
Torkel Ödegaard
0903aa4596 Merge pull request #2980 from tdyas/linkSrv_fix_query_string_appending
fix appending query strings in linkSrv
2015-10-22 12:18:27 -04:00
Felix Barnsteiner
eb8c2d9053 Ability to set a low limit for Elasticsearch date histogram interval
closes #2901
2015-10-22 13:16:36 +02:00
Torkel Ödegaard
58497ed596 feat(panel): performance improvement for loading panels, closes #2994 2015-10-21 11:22:53 -04:00
Torkel Ödegaard
ae81fbdffe Merge branch 'master' of github.com:grafana/grafana 2015-10-21 10:59:17 -04:00
Torkel Ödegaard
fc0705e87c fix(elasticsearch): fix for daily pattern when getting index for today, is now using utc, fixes #2913 2015-10-21 10:59:02 -04:00
Jari Sukanen
f3ecdc5af4 influxdb: fix influxdb annotation query 2015-10-21 14:31:06 +03:00
Tom Dyas
867ac5df67 fix appending query strings in linkSrv
When linkSrv appends parameters to a URL's query string, it would blindly
add a ? to the URL even if the URL already contained a ? or the string
to add was empty. This change fixes that behavior and some other edge cases.

Includes a unit test to verify expected behavior.
2015-10-19 13:11:34 -04:00
Torkel Ödegaard
dbc1a9cf82 fix(influxdb_0.8.x): fixed issue with new timepicker ranges like The day so far, fixes #2936 2015-10-16 12:07:35 -04:00
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
Greg Look
882a988143 Add currency units from #1910. 2015-10-15 12:48:48 -07:00
Greg Look
0b3e33e226 Shorten percent unit labels. 2015-10-14 15:40:04 -07:00
Greg Look
85887ad1cf Add mile, fix menu values. 2015-10-14 14:51:33 -07:00
Greg Look
d94b6635af Add temperature and pressure units, split submenus. 2015-10-14 14:50:45 -07:00
Greg Look
3c7a483f5c Add length and volume units. 2015-10-14 14:14:25 -07:00
Greg Look
dc5c3a3939 Implement decibel and percentunit units.
Add tests to exercise new units as well.
2015-10-14 14:02:29 -07:00
Greg Look
70269c8196 Reformat unit menu definition. 2015-10-14 13:34:48 -07:00
Greg Look
51a589f5a6 Change formatFuncCreator to scaledUnits builder.
Abstract out both decimal and binary SI prefixes into builders using
scaledUnits.
2015-10-14 13:18:02 -07:00
Greg Look
7d24c5fda2 Add fixedUnit format builder. 2015-10-14 13:07:34 -07:00
Greg Look
0bc85d27f8 Group rounding and fixed number functions. 2015-10-14 12:56:31 -07:00
Greg Look
43c2ca2d7d Group value formats by type. 2015-10-14 12:51:59 -07:00
Greg Look
e3e21a251f Group helper functions in kbn.js. 2015-10-14 12:41:20 -07: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
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
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