Commit Graph

2170 Commits

Author SHA1 Message Date
Torkel Ödegaard
c629a58b6d refactor: removed graph height from legend decimal calc 2017-12-07 18:13:56 +01:00
Torkel Ödegaard
a7897b945b Merge branch 'graph-legend-v5' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-graph-legend-v5 2017-12-07 17:09:46 +01:00
Torkel Ödegaard
beb9f8ee74 Merge remote-tracking branch 'origin/master' into develop 2017-12-07 14:14:50 +01:00
Sven Klemm
a62ebb3e59 mysql: pass timerange for template variable queries (#10071)
* mysql: pass timerange for template variable queries

* mysql: document time range macro usage in template variables

* mysql: docs for on time range change refresh mode for template queries

* Revert "mysql: docs for on time range change refresh mode for template queries"

This reverts commit 5325972aa4.
2017-12-07 11:18:36 +01:00
Alexander Zobnin
58d40eb6a0 graph: fix legend height calculation 2017-12-07 12:39:10 +03:00
Sven Klemm
b44c599410 postgres: pass timerange for template variable queries (#10069)
* pass timerange for template queries when refresh is set to timerange
change

* document on time range change refresh mode for template queries
2017-12-07 10:05:04 +01:00
Alexander Zobnin
3cdf0dce56 graph: move auto decimals calc to ticks.ts and use it for legend values format. 2017-12-07 10:49:00 +03:00
Alexander Zobnin
2cf1c29eae graph: refactor (don't render twice) 2017-12-06 21:30:14 +03:00
bergquist
48d9d0d356 prom: enable min interval per panel
This commit makes it possible to set min interval per panel.
Overrides the value configured on the datasource.

ref #9705
2017-12-06 13:51:19 +01:00
Alexander Zobnin
6b4b7969fe graph: fix karma tests 2017-12-06 14:55:57 +03:00
Alexander Zobnin
0c3e04ca60 graph: render legend before graph 2017-12-06 14:14:00 +03:00
Patrick O'Carroll
3aa1cb012a added tooltip, fixes #10092 (#10097)
* added tooltip, fixes #10092

* fixed code formatting
2017-12-06 12:13:17 +01:00
Alexander Zobnin
ae80a589c1 graph: refactor 2017-12-06 12:22:35 +03:00
Alexander Zobnin
36b3309961 graph: convert legend.js to typescript 2017-12-06 11:29:13 +03:00
Alexander Zobnin
deebaabfc8 graph: make legend scrollable 2017-12-05 13:07:33 +03:00
bergquist
35232a77e6 removes unused properties
the dsType property caused some confusion about what datasource is
beeing used. I just removed it since it not beeing used.

closes #10072
2017-12-05 08:26:43 +01:00
Mitsuhiro Tanda
e8a6af7b22 fix templating undefined error (#10004) 2017-12-02 17:21:21 +01:00
Torkel Ödegaard
e871e56522 ux: add new panel and dash nav improvements 2017-12-01 20:11:55 +01:00
Torkel Ödegaard
b1a2344be1 added bundled dashboards 2017-11-30 16:51:06 +01:00
Carl Bergquist
af5ced0e18
Revert "prometheus nested query support" 2017-11-30 15:06:02 +01:00
Carl Bergquist
98f0305e68
Merge pull request #9983 from mtanda/prometheus_nested
prometheus nested query support
2017-11-30 14:57:34 +01:00
Mitsuhiro Tanda
98bb8bf761 prometheus nested query support 2017-11-29 18:34:44 +09:00
Torkel Ödegaard
e98af1b3fa updated libs and fixed new typescript errors 2017-11-27 12:14:57 +01:00
Torkel Ödegaard
bc81298d4c worked on search 2017-11-24 16:18:56 +01:00
Torkel Ödegaard
93d21bec75 Merge branch 'master' into develop 2017-11-24 09:25:14 +01:00
Torkel Ödegaard
b3ddcc8077 ux: sass fixes and polish 2017-11-23 20:41:16 +01:00
Patrick O'Carroll
4ce1ee4120 Migrate gfunc to ts (#9973)
* migrated gfunc from js to ts

* deleted gfunc.js, small fixes in gfunc.ts
2017-11-23 17:05:27 +01:00
Torkel Ödegaard
458f6fc4b2 sass refactoring and updating styles for list item elements 2017-11-23 12:54:12 +01:00
Torkel Ödegaard
856a0393ab Merge branch 'develop' into develop-scrollable-panels 2017-11-23 10:27:16 +01:00
Torkel Ödegaard
68bd17bd0e work on scrollable panels 2017-11-22 13:32:54 +01:00
Carl Bergquist
d8d44224f5
Merge pull request #9950 from seuf/es_56_max_concurrent_shards_request
Elasticsearch max_concurrent_shard_requests parameter for es 5.6+
2017-11-22 10:49:46 +01:00
Patrick O'Carroll
27e486d678 converted 3 .js files to .ts (#9958)
* converted files from .js to .ts
2017-11-22 10:11:50 +01:00
Torkel Ödegaard
9fc22e5a66 Merge branch 'master' of github.com:grafana/grafana into develop 2017-11-21 16:05:18 +01:00
Torkel Ödegaard
830c307bba progress on scrollable panels work 2017-11-21 14:30:33 +01:00
THIERRY SALLE
bd4d665d54 Elasticsearch max_concurrent_shard_requests parameter for es 5.6+ 2017-11-21 10:56:34 +01:00
bergquist
0390b4187b prom: add prom2 dashboard as bundled dashboard 2017-11-21 10:12:24 +01:00
Cody Boggs
999b1211b6 show top 5 max scrape durations by job, and fix legend format 2017-11-21 10:12:24 +01:00
Cody Boggs
9151a2468d fix scrape duration, add rule eval iteration stats, and reorg a bit 2017-11-21 10:12:24 +01:00
Cody Boggs
29de4e7c53 fix data source var and remove node_exporter dependency 2017-11-21 10:12:24 +01:00
Cody Boggs
d5ef0403af First draft of a Prometheus 2.0 Stats dashboard 2017-11-21 10:12:24 +01:00
Patrick O'Carroll
25f63e0581 converted test-files to jest 2017-11-20 15:25:42 +01:00
Patrick O'Carroll
59cebca4b2 converted influx-series to TS, converted test to jest 2017-11-20 14:31:51 +01:00
Alexander Zobnin
10e3b63ddb Merge remote-tracking branch 'upstream/develop' into feat-9887 2017-11-20 15:51:49 +03:00
Alexander Zobnin
f54547776d graph: disable zoom in non-timeseries modes (#9914) 2017-11-20 10:06:34 +01:00
Maytee Chinavanichkit
c1e5f5be87 Use correct moments format for Showing last us time instead of value test (#9923)
Fixes this issue:
PhantomJS 2.1.1 (Mac OS X 0.0.0) SingleStatCtrl showing last us time
instead of value should set formatted value FAILED
	expected '09/17/2017 4:56:37 pm' to equal '09/17/2017 16:56:37 pm'
2017-11-20 10:00:56 +01:00
Torkel Ödegaard
0e44fe082b Merge branch 'master' into develop 2017-11-17 15:49:17 +01:00
Torkel Ödegaard
6595be95eb influxdb: another minor refactor of #9474 2017-11-17 15:23:45 +01:00
Torkel Ödegaard
37409163b9 refactor: refactoring InfluxDB query builder with policy PR #9473 2017-11-17 15:16:36 +01:00
Torkel Ödegaard
bcb52417db refactor: refactoring InfluxDB query builder with policy PR #9473 2017-11-17 15:16:04 +01:00
Torkel Ödegaard
4b76c6d652 Merge branch 'master' of https://github.com/omki2005/grafana into omki2005-master 2017-11-17 14:57:44 +01:00