Commit Graph
2461 Commits
Author SHA1 Message Date
Torkel Ödegaard 0d3e06e68a feat(wizard): merged wizard poc 2016-05-12 14:45:32 +02:00
Torkel Ödegaard bf890719ff Merge remote-tracking branch 'origin/wizard' into export-dashboard2 2016-05-12 10:52:24 +02:00
Torkel Ödegaard 28eae1e7ff Merge branch 'master' into export-dashboard
Conflicts:
	packaging/publish/publish.sh
	public/app/features/dashboard/dynamicDashboardSrv.js
	public/test/specs/dynamicDashboardSrv-specs.js
2016-05-12 10:50:37 +02:00
Torkel Ödegaard 35f55cabf0 fix(templating): improved detection of nested template variables, fixes #4986, fixes #4987 2016-05-12 10:41:15 +02:00
Torkel Ödegaard 0201ac24e7 fix(templating): fixed issue with mixing repeated row and repeated panel, fixes #4988 2016-05-12 10:31:36 +02:00
Torkel Ödegaard 2c7447eaca feat(): started work on new import system 2016-05-11 16:18:52 +02:00
Torkel Ödegaard 8a3bdb3685 fix(typo): corrected spelling in error message, fixes #4982 2016-05-11 13:21:25 +02:00
Trent White 995f6be2c4 old grafana wordmark was still showing on login and sidebar (#4972) 2016-05-11 09:08:25 +02:00
Torkel Ödegaard 5b42753b8b feat(export): progress on dashboard export 2016-05-10 21:09:15 +02:00
Torkel Ödegaard 79a8017fe9 feat(export): more progress on dashboard export 2016-05-10 20:31:47 +02:00
Torkel Ödegaard db664c61a4 Merge branch 'master' into export-dashboard 2016-05-10 16:46:58 +02:00
Torkel Ödegaard ae66c3f289 fix(influxdb): minor editor display fix 2016-05-10 14:38:11 +02:00
Torkel Ödegaard 040dd91d2e fix(templating): fixed issue with current data source variable value, fixes #4934 2016-05-09 10:17:30 +02:00
Peggy Li 04ef25b6ff Set custom type for templating variables (#4941) 2016-05-07 07:58:01 +02:00
Torkel Ödegaard c7e7a0cd16 fix(singlestat): rerender singlestat and reevaluate thresholds on render, fixes #4920 2016-05-05 10:29:14 +02:00
Utkarsh Bhatnagar 70f7177025 Fixed deleting row bug (#4919) 2016-05-05 09:57:21 +02:00
Mathieu Payeur Levallois c86cdb1805 opentsdb: apply templating on filters (#4594) 2016-05-04 13:47:05 +02:00
Torkel Ödegaard bd15534360 fix(singlestat gauge): better font size handling for gauge, now value font size is used as scaling factor, fixes #4876 2016-05-04 11:46:21 +02:00
Idan Zalzberg bca8d6d07b singlestat/module.ts onDataError was calling onDataReceived incorrectly (#4897)
onDataError was calling onDataReceived with {data : []} which breaks at the first line since object has no map function.
The correct form is probably just []
2016-05-04 10:48:01 +02:00
bergquist 3d366c2a4c feat(graphs): align forms for line mode checkbox 2016-05-04 10:42:12 +02:00
Idan Zalzberg 2f7af968bf Bring back threshold line mode
Threshold line mode was somehow discarded from the HTML in the ui redesign, this brings it back
2016-05-04 10:04:00 +07:00
Matt Toback 543d247af8 Wrapped the form in a form tag and added a submit, the ng-click shoudl work the same, but now enter works. @torkelo, pls review (#4898) 2016-05-03 21:02:57 +02:00
Torkel Ödegaard 3bd4b5ccc6 Merge branch 'master' of github.com:grafana/grafana 2016-05-03 19:00:57 +02:00
Torkel Ödegaard f4a013946f feat(pluginlist): link in plugin list now goes to app/plugin default nav unless enabled 2016-05-03 19:00:42 +02:00
Matt Toback d2fd829a58 Update module.html 2016-05-03 12:42:37 -04:00
Torkel Ödegaard bb6f4fff87 feat(export/import): minor progress 2016-05-03 16:40:21 +02:00
Torkel Ödegaard 5ffd57695c feat(table): added support for column units overriding style units for table 2016-05-03 11:29:51 +02:00
Torkel Ödegaard f42b47e65b Merge branch 'master' into export-dashboard
Conflicts:
	public/app/features/dashboard/dashnav/dashnav.ts
2016-05-03 10:26:40 +02:00
Torkel Ödegaard 6dc24ab2d7 Merge branch 'master' of github.com:grafana/grafana 2016-05-03 10:25:16 +02:00
Torkel Ödegaard fe0b7533a1 fix(influxdb): quote number valued tag values, only not quote when operator is > or <, fixes #4885 2016-05-03 10:25:06 +02:00
Utkarsh Bhatnagar b8d861edc1 Fixed query editor UI for keywords (#4890) 2016-05-03 10:09:03 +02:00
Torkel Ödegaard 152e085310 fix(elasticsearch): minor form fix to elastic query editor 2016-05-02 16:34:07 +02:00
Torkel Ödegaard e6bccc5eff feat(influxdb): Added new functions moving_average and difference to query editor, closes #4698 2016-05-02 09:07:44 +02:00
yershalom 1b262d33f3 Added json to file name when exporting dashboard (#4869) 2016-05-01 15:31:01 +02:00
Utkarsh Bhatnagar f6d538bb98 Bug fix, match tooltip timezone to X-axis timezone (#4855)
* Bug fix, match tooltip timezone to X-axis timezone

* Small improvement
2016-04-30 16:41:24 +02:00
joelanford cbefd8f8ae Fixed legend labeling bug in Prometheus datasource (#4858) 2016-04-30 16:40:41 +02:00
Torkel Ödegaard 736ee3ffff fix(influxdb): Fixed issue with missing plus group by icon, fixes #4862 2016-04-30 16:35:42 +02:00
Torkel Ödegaard 36c583dddf fix(graphite): Fixed issue graphite png rendering option, fixes #4864 2016-04-30 16:26:25 +02:00
Torkel Ödegaard 70d03b7a1c fix(query editor): Fixed issue with removing query for data sources without collapsable query editors, fixes #4856 2016-04-29 23:20:48 +02:00
Torkel Ödegaard 0d85254a19 fix(annotations): Fixed issue with entering annotation edit view, fixes #4857 2016-04-29 23:14:39 +02:00
Torkel Ödegaard e3376136ca fix(css): Fixed max dashboard title width (media query) for large screens, fixes #4859 2016-04-29 23:07:37 +02:00
Torkel Ödegaard f8b4fcdc42 Merge branch 'master' into export-dashboard
Conflicts:
	packaging/publish/publish.sh
2016-04-29 15:01:47 +02:00
Torkel Ödegaard 6b467d5b3e fix(): spelling fix in templating editor 2016-04-29 08:40:53 +02:00
Archit Sharma 5372bcc7a2 fixes #4849 - minor fix for metric-segment-model (agg.field) 2016-04-29 07:21:52 +02:00
Torkel Ödegaard 0c9a19e38c Merge branch 'ds-template-var' 2016-04-28 19:31:56 +02:00
Torkel Ödegaard 8b4c7c94b8 feat(templating): completed work on templating as data source, closes #816 2016-04-28 19:31:43 +02:00
Torkel Ödegaard c4440eab4c fix(dashboard): fixed issue with render event after resize 2016-04-28 19:15:54 +02:00
Torkel Ödegaard 7349427189 feat(data source variable): progress on data source as variable 2016-04-28 19:08:35 +02:00
Torkel Ödegaard 89ea25ca08 feat(templating): minor sort fix 2016-04-28 18:26:41 +02:00
Torkel Ödegaard 5d652dcaef fix(table): table column sorting fix 2016-04-28 15:48:49 +02:00