Commit Graph

5041 Commits

Author SHA1 Message Date
Torkel Ödegaard
32ffb2d544 progress on page header 2017-12-01 10:27:05 +01:00
Torkel Ödegaard
6f5a9bf768 ux: new page header progress 2017-11-30 17:28:24 +01:00
Torkel Ödegaard
b1a2344be1 added bundled dashboards 2017-11-30 16:51:06 +01:00
Torkel Ödegaard
b2add1977a ux: progress on new page header 2017-11-30 16:35:27 +01:00
Marcus Efraimsson
d83692aa80 dashboard: when changing route, scroll to top 2017-11-30 15:59:53 +01:00
Torkel Ödegaard
74ceb76ec0 ux: work on page header 2017-11-30 15:37:03 +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
Torkel Ödegaard
645f49eda4 ux: updating header design for pages 2017-11-30 11:31:38 +01:00
Marcus Efraimsson
1db9aeaac3 fix: when navigating, scroll to top 2017-11-30 10:50:10 +01:00
Alexander Zobnin
88760983ab repeat row: add more tests 2017-11-30 10:42:53 +03:00
Torkel Ödegaard
47f11c26c0 ux: new page header design 2017-11-30 08:18:23 +01:00
Torkel Ödegaard
3d2d789ca2 ux: search filter box 2017-11-29 17:15:27 +01:00
Torkel Ödegaard
8141987303 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-11-29 15:26:37 +01:00
Torkel Ödegaard
c9be5c21ae ux: changed body default font size to 13px 2017-11-29 15:26:16 +01:00
Matt
ce494fbedb Added border radius and tightened up the folder boxes. Still needs to have the bottom margin expanded to 8px when in opened state (this needs @torkelo) 2017-11-29 14:45:12 +01:00
Alexander Zobnin
36ef186587 repeat row: expose scopedVars to row panels 2017-11-29 16:40:13 +03:00
Torkel Ödegaard
d981fe4f04 ux: search design update 2017-11-29 13:21:42 +01:00
Alexander Zobnin
dd9c727e60 repeat row: handle collapsed rows 2017-11-29 14:14:43 +03:00
Alexander Zobnin
08d470d76a dashboard: initial repeat row implementation 2017-11-29 12:51:14 +03:00
Mitsuhiro Tanda
98bb8bf761 prometheus nested query support 2017-11-29 18:34:44 +09:00
Marcus Efraimsson
6c5748203d Restore Page Footer after migration to new scrollbar #9652 2017-11-28 14:17:53 +01:00
Patrick O'Carroll
afd0fc3652 export view json now templatized, fixes #10001 2017-11-28 13:27:43 +01:00
Patrick O'Carroll
b19b68df08 styling changes for light theme 2017-11-28 11:27:29 +01:00
Alexander Zobnin
852218e834 grid: use single column layout for mobile devices (#9999) 2017-11-28 09:38:35 +01:00
Alexander Zobnin
b97ad93be1 fix panel solo mode (#10002) 2017-11-28 09:38:28 +01:00
Marcus Efraimsson
8f4ad1e496 dashlist: handle recent dashboards removed from backend 2017-11-28 09:07:28 +01:00
Daniel Lee
07cd182617 datasource: fix merge conflict - restore dashboards tab 2017-11-27 15:17:50 +01:00
Torkel Ödegaard
7f3a3b9e55 search fix and update buttons on dashboard list page 2017-11-27 14:49:31 +01:00
Torkel Ödegaard
c38a64e4cc Merge remote-tracking branch 'origin/migrate-view-state' into develop 2017-11-27 13:37:12 +01:00
Torkel Ödegaard
734aa37434 fix: removed table background 2017-11-27 13:36:25 +01:00
Torkel Ödegaard
fdb217c283 build: fixed lint issue 2017-11-27 13:19:33 +01:00
Patrick O'Carroll
be74957a60 fixed link i specs-file 2017-11-27 12:29:20 +01:00
Alexander Zobnin
24fe3af20f Improve dashboard grid layout migration WIP (#9943)
* grid: fix small panels migration and make panel height closer to row height

* grid: migrate rows

* grid: increase min panel height

* grid: fix panel placement for complex layouts

* dashboard migration: refactor

* dashboard migration: add tests for grid layout

* dashboard: fix complex layout migration

* dashboard migration fix: fill current row if it possible

* test: fix karma tests by setting default panel span

* dashboard: fix migration when panel height more than row height

* dashboard: fix migration for collapsed rows

* grid: add all rows if even one collapsed or titled row is present
2017-11-27 12:22:52 +01:00
Torkel Ödegaard
adfb87e811 Merge branch 'develop' into alexanderzobnin-feat-9932 2017-11-27 12:19:07 +01:00
Torkel Ödegaard
df2d49da33 test fix 2017-11-27 12:16:40 +01:00
Torkel Ödegaard
0a1c8fdac4 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-11-27 12:15:58 +01:00
Torkel Ödegaard
e98af1b3fa updated libs and fixed new typescript errors 2017-11-27 12:14:57 +01:00
Marcus Efraimsson
7ce766d9d4 dashlist: Support for clear all filters 2017-11-27 11:33:54 +01:00
Patrick O'Carroll
e3f45546d1 migrated viewstatesrv to ts 2017-11-27 11:23:15 +01:00
Torkel Ödegaard
517c454f8b Merge branch 'feat-9932' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-feat-9932 2017-11-27 09:50:01 +01:00
Torkel Ödegaard
ac17684f50 ux: table design work 2017-11-26 22:07:34 +01:00
Alexander Zobnin
0c7bf42dd6 panel: open panel menu by click on header 2017-11-24 21:44:47 +03:00
Torkel Ödegaard
00df24b348 ux: search progress 2017-11-24 16:54:55 +01:00
Torkel Ödegaard
bc81298d4c worked on search 2017-11-24 16:18:56 +01:00
Patrick O'Carroll
015932fd02 migrated four files from js to ts 2017-11-24 13:38:54 +01:00
Patrick O'Carroll
b752cfee1f migrated four files to ts, addd some code to config to make it work (#9980) 2017-11-24 12:59:36 +01:00
Torkel Ödegaard
93d21bec75 Merge branch 'master' into develop 2017-11-24 09:25:14 +01:00
Torkel Ödegaard
02e2d5da2b ux breadcrumb work 2017-11-23 21:50:20 +01:00
Torkel Ödegaard
b3ddcc8077 ux: sass fixes and polish 2017-11-23 20:41:16 +01:00
Marcus Efraimsson
d9ecb59dae dashlist: Support for check/uncheck all 2017-11-23 18:32:44 +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
Patrick O'Carroll
3acf106303 migrated admin files to ts (#9975) 2017-11-23 17:05:08 +01:00
Patrick O'Carroll
b94839574c migration of org files from js to ts (#9974)
* migration of org files from js to ts

* more migration of org files to ts

* minor fix to change_password

* renamed files
2017-11-23 17:04:50 +01:00
Torkel Ödegaard
99e52143df sass tweaks 2017-11-23 16:50:22 +01:00
Marcus Efraimsson
7ee57b774a dashlist: When searching should reset checked state to false 2017-11-23 14:59:52 +01:00
Patrick O'Carroll
b7956ef499 More js to ts (#9966)
* four files js to ts, fixed ng_model_on_blur

* added /** @ngInject */
2017-11-23 14:53:23 +01:00
Daniel Lee
9ba9043d64 dashlist: change scrollbar to new perfect scroll directive 2017-11-23 13:31:35 +01:00
Torkel Ödegaard
84c46f0cd3 ux: fixed sass issue 2017-11-23 13:01:19 +01:00
Torkel Ödegaard
2b1371c4b8 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-11-23 12:54:35 +01:00
Torkel Ödegaard
458f6fc4b2 sass refactoring and updating styles for list item elements 2017-11-23 12:54:12 +01:00
Daniel Lee
245cebedde dashlist: style list to be same as dash search 2017-11-23 11:53:55 +01:00
Torkel Ödegaard
a1d47d36f6 css tweaks and cleanup 2017-11-23 11:37:59 +01:00
Torkel Ödegaard
d9a913afe1 Merge branch 'develop-scrollable-panels' into develop 2017-11-23 11:13:21 +01:00
Torkel Ödegaard
f18f1a1093 removing gemini scrollbar and replacing with perfect scrollbar, muuuch better 2017-11-23 11:12:32 +01:00
Torkel Ödegaard
856a0393ab Merge branch 'develop' into develop-scrollable-panels 2017-11-23 10:27:16 +01:00
Daniel Lee
41a3431c4e dashlist: starred filter search 2017-11-22 18:44:57 +01:00
Torkel Ödegaard
2d2015d3dd ux: tweaked panel color and dashboard background is same as page background 2017-11-22 17:18:04 +01:00
Torkel Ödegaard
c94331cd20 Merge branch 'develop' into develop-color-tweaks 2017-11-22 14:54:57 +01:00
Torkel Ödegaard
b7a8db4937 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-11-22 14:51:53 +01:00
Torkel Ödegaard
905553052a removed call to unused function in panel_ctrl 2017-11-22 14:47:26 +01:00
Torkel Ödegaard
85e81959f2 scrollable panels works better with perfect-scrollbar 2017-11-22 14:46:17 +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
Alexander Zobnin
18ca7a53aa scrollable panels: fix initial content size (#9960) 2017-11-22 07:05:33 +01:00
Daniel Lee
ba511f3e24 dashlist: adds tag filter select (GitHub style) 2017-11-21 18:53:49 +01:00
Daniel Lee
121d48ec26 dashlist: toggle folders 2017-11-21 17:06:30 +01:00
Torkel Ödegaard
9fc22e5a66 Merge branch 'master' of github.com:grafana/grafana into develop 2017-11-21 16:05:18 +01:00
Daniel Lee
bd2b26e9f5 dashlist: fix tag filtering and some css 2017-11-21 14:47:19 +01:00
Torkel Ödegaard
43a6a65f8b fix: fixed issue with metric segment introduced in graphite tags query editor PR 2017-11-21 14:39:09 +01:00
Torkel Ödegaard
830c307bba progress on scrollable panels work 2017-11-21 14:30:33 +01:00
Torkel Ödegaard
741e5a38bd Merge branch 'feat-9887' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-feat-9887 2017-11-21 11:55:07 +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
Trent White
56118b9fa4 tweak tabs: 2017-11-20 13:59:21 -05:00
Trent White
8fe8a62645 color fix 2017-11-20 13:31:04 -05:00
Trent White
ec49dd9231 make grays cooler 2017-11-20 13:27:20 -05:00
Daniel Lee
8daff73ba2 dashlist: started fixing js/css after design changes 2017-11-20 18:15:59 +01:00
Torkel Ödegaard
afa226bec3 updated search 2017-11-20 16:31:23 +01:00
Torkel Ödegaard
a8552bac21 more work on search 2017-11-20 16:21:50 +01:00
Torkel Ödegaard
c1539b90b7 minor update to dashboard search 2017-11-20 15:46:16 +01:00
Patrick O'Carroll
25f63e0581 converted test-files to jest 2017-11-20 15:25:42 +01:00
Torkel Ödegaard
9ace21b689 improved search srv 2017-11-20 15:11:32 +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
Torkel Ödegaard
6c5e19c1e0 dashboard search 2017-11-20 13:37:26 +01:00
Torkel Ödegaard
fc1d8416a7 working on dashboard search 2017-11-20 12:47:03 +01:00
Ryan McKinley
b1de1e6f26 Move the loading flag to PanelCtrl (#9929) 2017-11-20 11:27:18 +01:00
Alexander Zobnin
f54547776d graph: disable zoom in non-timeseries modes (#9914) 2017-11-20 10:06:34 +01:00
Patrick O'Carroll
66e4297816 changed padding to pixels, fixes #9916 (#9924) 2017-11-20 10:05:18 +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
0fe4229023 Merge branch 'develop' into develop-search 2017-11-17 16:37:09 +01:00
Torkel Ödegaard
8160e68f93 fix: build & tests 2017-11-17 16:18:30 +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
Torkel Ödegaard
7ccc8ae298 elasticsearch: default version to 5.x 2017-11-17 12:23:40 +01:00
Alexander Zobnin
490b8fc50f panels: add css tweaks for scrollable panels 2017-11-17 12:13:56 +03:00
Torkel Ödegaard
26577ab600 Merge branch 'master' into graphite-series-by-tags 2017-11-16 16:20:44 +01:00
Carl Bergquist
9ea5af578e
Merge pull request #9504 from grafana/datasource_as_cfg
Datasources as configuration
2017-11-16 16:13:02 +01:00
Torkel Ödegaard
3ae0cfa1d0 graphite: minor changes 2017-11-16 14:16:37 +01:00
Alexander Zobnin
126f3703dc text panel: make scrollable 2017-11-16 15:43:04 +03:00
Alexander Zobnin
4b88cc0226 panels: general property which makes panel scrollable 2017-11-16 15:38:52 +03:00
Torkel Ödegaard
119f5427af fix: fix cloudwatch metricFindQuery error that stopped it working completely, fixes #9876 2017-11-16 13:06:24 +01:00
Alexander Zobnin
fd046428b4 dashlist: css adjustments for scrollbar 2017-11-16 14:41:42 +03:00
Alexander Zobnin
e89e64e94e dashlist: fix resizing after mode switching 2017-11-16 14:40:09 +03:00
Alexander Zobnin
7d8b2cb05f dashlist: add scrollbar 2017-11-16 14:11:01 +03:00
Alexander Zobnin
06622088a1 dashlist: fix panel resizing 2017-11-16 14:10:28 +03:00
Patrick O'Carroll
d800e64368 fixes: #1871 Dropdown starred (#9490)
adding the ability to star dashboard in search and dashboard-list

closes #1871
2017-11-15 15:01:44 +01:00
Torkel Ödegaard
3b18adfe1a graphite: progress on new query editor 2017-11-15 14:35:22 +01:00
bergquist
36676e23c1 datasource as cfg: adds readonly datasources 2017-11-15 14:30:32 +01:00
Bruno Binet
014f6d5a75 More energy units (#9743)
* Add mA, mV, mW energy units

* Update case to be consistent with other energy units
2017-11-15 14:23:42 +01:00
Ryan McKinley
41be15ee4e Add feet to the length menu (#9889) 2017-11-15 14:06:17 +01:00
Torkel Ödegaard
acede1d5f9 graphite: progress on new query editor 2017-11-15 13:45:51 +01:00
Carl Bergquist
5d6ed6c45f
prom: add support for default step param (#9866)
Alerting for prometheus have been depending on the step parameter from each query.
In https://github.com/grafana/grafana/pull/9226 we changed the behavior for step in the
frontend which caused problems for alerting. This commit fixes that by introducing a default
min interval value so alerting always have something to depend on. 

closes #9777
2017-11-15 11:22:00 +01:00
Torkel Ödegaard
b5b93a68fc Merge branch 'master' into graphite-series-by-tags 2017-11-15 11:12:11 +01:00
Torkel Ödegaard
1a3170373a Merge branch 'alertList-notOK' 2017-11-15 10:48:20 +01:00
Torkel Ödegaard
a534ac4948 build: fixed jshint error 2017-11-14 12:42:45 +01:00
Sven Klemm
108f582ec4 sync documentation, add remark about to_timestamp and redshift (#9841) 2017-11-14 11:33:55 +01:00
Torkel Ödegaard
6a976a3f48 Merge branch 'master' of github.com:grafana/grafana 2017-11-14 11:27:57 +01:00
Torkel Ödegaard
012b72cdbf fix: Html escaping caused issue in InfluxDB query editor, could not pick greater than or less then operators, fixes #9871 2017-11-14 11:27:36 +01:00
Anton Huck
fd2451823b Add Microsoft Teams notifier 2017-11-14 11:05:01 +01:00
Alexander Zobnin
e7f3480803 heatmap: fix tooltip in "Time series bucket" mode, #9332 (#9867) 2017-11-13 15:20:12 +01:00
Marcus Efraimsson
ecbe7d06a6 fix: Table panel now renders annotations correctly. Fixes #9842 (#9868) 2017-11-13 15:18:39 +01:00
Torkel Ödegaard
685ee393af
graph: the stack & legend sort sync was not working correctly, the z-index sorting that happened in after the legend sort order was applied and messed with the order even though the sort function returned zero for all entries, combined the sort function to one sort function, fixes #9789 (#9797) 2017-11-13 12:09:26 +01:00
Patrick O'Carroll
9ad186bcc9 not ok option to alert list, fixes: #9754 2017-11-13 10:30:11 +01:00
Mitsuhiro Tanda
ae4bcdd54b fix query inspector for cloudwatch 2017-11-12 00:41:14 +09:00
Dan Cech
5b38c230db use SHOW RETENTIONS to test influxdb connection (#9824) 2017-11-08 20:33:15 +01:00
Mitsuhiro Tanda
e46814ba05 fix date test (#9811) 2017-11-08 11:01:19 +01:00
Alexander Zobnin
f5c5c4b88b graph: don't change original series name in histogram mode, #8886 (#9782) 2017-11-04 08:09:41 +01:00
Alexander Zobnin
a3bf38cc21 colorpicker: fix color string change #9769 (#9780) 2017-11-03 13:29:00 +01:00
Torkel Ödegaard
f18de7e6a0 Merge branch 'alertList-no-alerts' 2017-11-03 10:17:07 +01:00
Torkel Ödegaard
cd95f5bcc2 refactor: alert list panel fixes and no alerts message, rewrite of PR #9721 2017-11-03 10:16:25 +01:00