IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-29 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,169 Commits 1,119 Branches 715 Tags
ad7a1e15b4d0830c0589aad7bdc406f2339f9078
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard ad7a1e15b4 feat(export): began working on export modal 2016-05-17 10:29:57 +02:00
Torkel Ödegaard 7cd663bbe8 feat(import): more import work 2016-05-14 10:00:43 +02:00
Torkel Ödegaard d9d46096dd feat(import): lots of work on dashboard import 2016-05-13 17:39:22 +02:00
Torkel Ödegaard ca8df67947 feat(import): things are starting to work 2016-05-13 11:26:02 +02:00
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 731c35540f packaging(): default RESTART_ON_UPGRADE to true, closes #4993 2016-05-12 07:29:33 +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
Torkel Ödegaard 85e8cba7a1 Merge branch 'master' of github.com:grafana/grafana 2016-05-11 13:20:14 +02:00
Torkel Ödegaard 56bf9c5612 fix(): changed how package iteration/build is generated 2016-05-11 13:20:01 +02:00
Torkel Ödegaard 03663c5b28 docs(): updated download links 2016-05-11 10:23:17 +02:00
Torkel Ödegaard bbd52c0b71 changelog(): updated and updated version 2016-05-11 09:36:07 +02:00
Torkel Ödegaard 5b42753b8b feat(export): progress on dashboard export 2016-05-10 21:09:15 +02:00
Torkel Ödegaard 959714a6ef feat(docs): updated what's new article 2016-05-10 20:33:42 +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 c299b86983 docs(): updated readme 2016-05-10 16:33:05 +02:00
Torkel Ödegaard 56e53d7da2 docs(): update readme dependency section 2016-05-10 16:07:59 +02:00
Torkel Ödegaard d676840258 docs(): added homebrew info to mac install docs 2016-05-10 16:02:00 +02:00
Torkel Ödegaard ae66c3f289 fix(influxdb): minor editor display fix 2016-05-10 14:38:11 +02:00
Torkel Ödegaard 72b324c95b fix(go16): fixed hang with go 1.6 by updating sqlite3, fixes #4367 2016-05-10 11:22:06 +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
Torkel Ödegaard c6c07599c7 conf(): updated comments in config file, fixes #4933 2016-05-09 09:21:33 +02:00
Torkel Ödegaard c7e7a0cd16 fix(singlestat): rerender singlestat and reevaluate thresholds on render, fixes #4920 2016-05-05 10:29:14 +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
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
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
Torkel Ödegaard 152e085310 fix(elasticsearch): minor form fix to elastic query editor 2016-05-02 16:34:07 +02:00
Torkel Ödegaard 372b394f5b Merge branch 'master' of github.com:grafana/grafana 2016-05-02 15:41:20 +02:00
Torkel Ödegaard 3889052c31 docs(): added whats new in v3 guide 2016-05-02 15:35:49 +02:00
Torkel Ödegaard 43182cb1eb updated 2016-05-02 14:49:50 +02:00
Torkel Ödegaard 072f51e300 fix(): updated changelog 2016-05-02 10:18:22 +02:00
Torkel Ödegaard af95993d6d feat(): updated download links 2016-05-02 09:54:11 +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
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 6c340dcb65 docs(): updated download links 2016-04-29 11:24:43 +02:00
Torkel Ödegaard 6b467d5b3e fix(): spelling fix in templating editor 2016-04-29 08:40:53 +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
Torkel Ödegaard d69788c9df Merge branch 'master' of github.com:grafana/grafana 2016-04-28 15:30:09 +02:00
Torkel Ödegaard 69c2fafa7a feat(elasticsearch): added geo hash bucket aggregation 2016-04-28 15:29:54 +02:00
Torkel Ödegaard 5a241a8290 fix(): minor query editor fix 2016-04-28 10:29:36 +02:00
Torkel Ödegaard 4a332065d0 changelog(): updated changelog with notice about new query editors, closes #3900 2016-04-28 10:22:17 +02:00
Torkel Ödegaard 0e4b70a4a8 feat(query_editors): more work 2016-04-28 10:13:18 +02:00
Torkel Ödegaard f1d4fd3e67 feat(query editors): changed chevron position 2016-04-27 21:24:41 +02:00
Torkel Ödegaard 7b560f9080 feat(query editors): converted OpenTSDB editor to new form styles 2016-04-27 16:29:59 +02:00
Torkel Ödegaard 0ebd921bbb feat(query editors): updated cloudwatch to new form styles 2016-04-27 11:07:26 +02:00
Torkel Ödegaard 206cb51219 feat(query editors): updated prometheus editor 2016-04-27 10:50:29 +02:00
Torkel Ödegaard 5e6485c210 feat(query editors): minor progress 2016-04-27 10:16:04 +02:00
Torkel Ödegaard 65b4945548 Merge branch 'master' into query-editor-style 2016-04-27 08:43:34 +02:00
Torkel Ödegaard aa98ada141 fix(snapshots): fixed snapshot issue introdiuced yesterday 2016-04-26 14:51:06 +02:00
Torkel Ödegaard 26eeb6578d feat(gauge): polish to gauge, better handling of automatic font size, added option to hide threshold markers 2016-04-26 13:50:04 +02:00
Torkel Ödegaard 8bb07124f7 fix(gauge): validate min / max range, fixes #4820 2016-04-26 13:14:43 +02:00
Torkel Ödegaard bce5c447b3 fix(apps): app dashboards can now be updated, fixes #4817 2016-04-26 12:52:44 +02:00
Torkel Ödegaard 34cb17546d fix(): minor fix for event emitter 2016-04-26 12:39:24 +02:00
Torkel Ödegaard 7c06604f16 Merge branch 'master' of github.com:grafana/grafana 2016-04-26 11:00:20 +02:00
Torkel Ödegaard 0762c38d35 fix(ds_edit): dont show warning when data source does not support testing, fixes #4811 2016-04-26 10:59:57 +02:00
Torkel Ödegaard bca0894f73 feat(query editors): progress on query editors 2016-04-26 09:58:55 +02:00
Torkel Ödegaard bbf4d00319 fix(query editors): added select style to segment, used by data source selector 2016-04-25 15:49:33 +02:00
Torkel Ödegaard 6b813b4e2a feat(query editors): remember collapsed state 2016-04-25 15:11:40 +02:00
Torkel Ödegaard 529cb43397 Merge branch 'master' of github.com:grafana/grafana into query-editor-style 2016-04-25 14:30:41 +02:00
Torkel Ödegaard 6bc898b215 fix(influxdb): fixed issue with using multi value template vars in influxdb measurement clause, fixes #4797 2016-04-25 14:29:51 +02:00
Torkel Ödegaard 1a433de0b4 Merge branch 'master' into query-editor-style 2016-04-25 14:22:36 +02:00
Torkel Ödegaard 4d802df040 fix(influxdb): fixed issue with using multi value template vars in influxdb measurement clause, fixes #4797 2016-04-25 14:22:15 +02:00
Torkel Ödegaard 04a79175bf fix(plugins): only add app nav link if it has any pages/dashboards with role matching current user, fixes #4784 2016-04-25 14:00:49 +02:00
Torkel Ödegaard 97656d65ec db(dashboard): minor fix for dashboard delete 2016-04-25 11:22:13 +02:00
Torkel Ödegaard ba28d2e13f Merge branch 'master' of github.com:grafana/grafana 2016-04-25 09:26:57 +02:00
Torkel Ödegaard 711992c8e2 fix(influxdb): minor fix for duplicated db param to proxied influxdb call, fixes #4703 2016-04-25 09:26:47 +02:00
Torkel Ödegaard 00827ce921 fix(): let binding cycle complete before adding panel to dom 2016-04-24 12:50:33 +02:00
Torkel Ödegaard 9917de09af fix(graph): removed angular copy that was no longer needed 2016-04-22 15:49:51 +02:00
Torkel Ödegaard 8b656f15b9 feat(graphite): added stddevSeries func def, closes #4782 2016-04-22 14:57:16 +02:00
Torkel Ödegaard 723bfa70db fix(table panel): fixed issue with string array formating, fixes #4791 2016-04-22 14:46:32 +02:00
Torkel Ödegaard 45dd9c5795 fix(graph panel): fix for graph panel alignment when legend is in table mode, fixes #4772 2016-04-22 14:36:20 +02:00
Torkel Ödegaard fa479afdaa Merge branch 'master' of github.com:grafana/grafana 2016-04-22 14:00:08 +02:00
Torkel Ödegaard 1dfeb192a3 fix(templating): another fix for templating and custom all value escaping, fixes #4787 2016-04-22 13:59:54 +02:00
Torkel Ödegaard dfe36fb702 feat(panel): added new panel event panel-initialized 2016-04-22 11:41:56 +02:00
Torkel Ödegaard 297c829bdc tech(): updatad sass-lint 2016-04-22 09:47:30 +02:00
Torkel Ödegaard 7079b5d770 fix(dashboard list): fixed minor issue with dashboard list panel, fixes #4768 2016-04-20 09:15:45 -07:00
Torkel Ödegaard bd21a08bc9 fix(templating): fixed encoding of all value for regex, and custom all value, fixes #4755, fixes #4736 2016-04-18 17:33:51 -04:00
Torkel Ödegaard 39cdaf5175 ux(query-editors): more progress and fixes 2016-04-18 11:35:24 -04:00
Torkel Ödegaard 14ec69a160 Merge remote-tracking branch 'origin/master' into query-editor-style 2016-04-18 09:51:35 -04:00
Torkel Ödegaard 8ebe9d1e16 Merge branch 'query-editor-style' of github.com:grafana/grafana into query-editor-style 2016-04-18 09:51:28 -04:00