IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-14 09:33:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
8,322 Commits 5,449 Branches 554 Tags 1.9 GiB
524f505664
Commit Graph

1295 Commits

Author SHA1 Message Date
Torkel Ödegaard
392407136d Merge branch 'export-dashboard' of github.com:grafana/grafana into export-dashboard 2016-05-25 12:33:30 +02:00
Torkel Ödegaard
ba6573af61 Merge branch 'master' into export-dashboard 
Conflicts:
	public/app/features/dashboard/submenu/submenu.ts
 2016-05-25 12:32:56 +02:00
Matt Toback
8d988f9582 Export dashboard bulletfactory (#5160) 
* create descriptions and styles for share dropdown

* Updating actual modal layout for Sharing

* Updated the modals to follow the new styles, fixed the wrapping issue on the main menu. Standardized buttons.
 2016-05-25 12:30:27 +02:00
Torkel Ödegaard
f5c5d1b1da Merge branch 'master' of github.com:grafana/grafana 2016-05-25 11:04:27 +02:00
Torkel Ödegaard
2cd6c2e7e0 Merge branch 'v3.0.x' 2016-05-25 11:04:12 +02:00
Torkel Ödegaard
0daadc954c fix(templating): fixed issue with detecting data source variable in other template variable definition, fixes #5165 2016-05-25 10:46:55 +02:00
Torkel Ödegaard
71d62012e1 fix(panel): fixed issue with fullscreen panel view and switching to another dashboard, fixes #5163 2016-05-25 09:46:15 +02:00
Torkel Ödegaard
41deea90ee feat(dashboard): template variable changes updates url, closes #5002 2016-05-24 16:34:17 +02:00
Torkel Ödegaard
a81806d3d0 feat(dashboard): sync time range with url, closes #458 2016-05-24 16:32:28 +02:00
Torkel Ödegaard
e81614b9e9 Merge branch 'v3.0.x' 2016-05-24 09:50:41 +02:00
Torkel Ödegaard
6f094ef215 fix(templating): fixed issue with nested template variables and multi select, the child variable selection state is now updated like single select variables, so if none matches the first option is selected, fixes #4861 2016-05-24 09:50:23 +02:00
Torkel Ödegaard
93665f49b1 Merge branch 'v3.0.x' 2016-05-23 11:06:53 +02:00
Torkel Ödegaard
dc77d555f9 fix(elasticsearch): fixed templating issue with elasticsearch, fixes #5135 2016-05-23 10:58:31 +02:00
Torkel Ödegaard
c60d737928 Merge branch 'v3.0.x' 
Conflicts:
	package.json
 2016-05-23 09:29:14 +02:00
Torkel Ödegaard
1da149d9e1 feat(annotations): annotations can now use a template variable as data source, closes #5054 2016-05-23 09:28:14 +02:00
minki
05cb6048ae fixed separate typo 2016-05-23 09:32:18 +09:00
Peggy Li
d36c1769e0 Fix wording of the dashboard tags popover text 2016-05-31 17:29:31 +00:00
Torkel Ödegaard
9eb7b192b8 Merge branch 'master' of github.com:grafana/grafana 2016-05-20 15:16:05 +02:00
Torkel Ödegaard
06d63dda6e Merge branch 'v3.0.x' 2016-05-20 15:15:30 +02:00
Torkel Ödegaard
e6f251011f fix(panel span): fixed issue setting panel span while in fullscren and also an issue when changing repeat variable while in fullscreen view, fixes #4957 2016-05-20 15:15:02 +02:00
Torkel Ödegaard
6a813aa33d fix(export): better error handling 2016-05-20 14:45:22 +02:00
David J. Felix
441682b598 Fix linking for /dashboard-solo/ proxy prefix (#5116) 
Fixes #5109
 2016-05-20 14:01:12 +02:00
Torkel Ödegaard
35c05463e7 Merge branch 'v3.0.x' 2016-05-20 12:23:50 +02:00
Torkel Ödegaard
f00cbc0aeb fix(panel height): fixed issue with singlestat height, fixes #4679, fixes #4894, fixes #5113 2016-05-20 12:23:26 +02:00
Torkel Ödegaard
58a9324db0 Merge branch 'v3.0.x' 2016-05-20 10:24:54 +02:00
Torkel Ödegaard
e0e8fd6637 fix(templating): fixed handling of numeric values in tempalting query results, fixes #5097 2016-05-20 10:24:24 +02:00
Torkel Ödegaard
2416ee04c8 fix(templating): fixed detection of nested template variables, fixes #5103 2016-05-20 09:58:07 +02:00
Torkel Ödegaard
e47957ce6d Merge branch 'master' of github.com:grafana/grafana 2016-05-20 08:32:40 +02:00
Torkel Ödegaard
c54e688272 Merge branch 'v3.0.x' 2016-05-20 08:31:51 +02:00
Torkel Ödegaard
37821e6d63 fix(share modal): fixed link in share modal when sub app url is /dashboard/, fixes #5109 2016-05-20 08:31:27 +02:00
Torkel Ödegaard
855e913bbd feat(dashboards): began work on dashboard list 2016-05-19 11:03:10 +02:00
Torkel Ödegaard
fb74d10573 feat(export): added grafana version to requires array, #5084 2016-05-19 10:21:16 +02:00
Torkel Ödegaard
430bcf192f feat(export): templetize annotations and template vars, #5084 2016-05-19 10:01:31 +02:00
Torkel Ödegaard
cac723dab3 Merge branch 'master' into export-dashboard 2016-05-19 08:48:24 +02:00
bergquist
402499c071 Merge branch 'master' into alerting_definitions 2016-05-19 08:47:34 +02:00
bergquist
617d18e587 feat(panel): active tab is now placed in querystring aswell 2016-05-19 08:42:21 +02:00
bergquist
a379b0057a feat(alerting): link to dashboard goes directly to alerting tab 2016-05-19 08:13:20 +02:00
bergquist
ef4f5147be Merge branch 'master' into alerting_definitions 2016-05-19 08:05:35 +02:00
bergquist
2b06ceda71 feat(panels): adds queryparameter for choose active tab in edit mode 2016-05-19 08:00:48 +02:00
Torkel Ödegaard
673984a7db feat(export): more export stuff 2016-05-18 15:53:13 +02:00
Torkel Ödegaard
10339090b8 fix(annotations): fixed annotation error handling, fixes #5077 2016-05-18 15:22:40 +02:00
Torkel Ödegaard
602d1a5fbc Merge branch 'v3.0.x' 2016-05-18 12:02:53 +02:00
Torkel Ödegaard
cd80884b76 fix(dashboard timepicker): fixed issue with time picker and UTC when reading time from url, fixes #5078 2016-05-18 12:01:11 +02:00
Torkel Ödegaard
0cd2e150d5 feat(snapshots): performance improvements to deep clone, makes snapshot's a lot quicker for big dashboards with a lot of panels and data 2016-05-18 11:50:40 +02:00
Torkel Ödegaard
26ea0bc360 feat(export): work on export 2016-05-18 11:11:53 +02:00
Torkel Ödegaard
6632f883c0 Merge branch 'master' into export-dashboard 
Conflicts:
	.floo
	.flooignore
 2016-05-18 08:08:15 +02:00
Torkel Ödegaard
05d064ca8d export(): moved to share modal 2016-05-17 21:18:47 +02:00
Torkel Ödegaard
df50fa2332 feat(export): export dashboard modal 2016-05-17 11:17:11 +02:00
Torkel Ödegaard
ad7a1e15b4 feat(export): began working on export modal 2016-05-17 10:29:57 +02:00
bergquist
2ce9d4571c fix(alerting): fix spacing 2016-05-16 14:29:54 +02:00
Mitsuhiro Tanda
f585d22ce7 (templating) update dynamic dashboard only if variable is changed 2016-05-16 19:26:24 +09:00
bergquist
80f7fe8646 feat(alerting): add confirm text dialog when deleting dashboards with alerts 2016-05-16 11:54:28 +02:00
bergquist
31698a1c55 Merge branch 'master' into alerting_definitions 2016-05-16 09:28:14 +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
Mitsuhiro Tanda
3b85901b95 reflect panel repeat status when variable updated 2016-05-13 16:29:11 +09:00
Prajwal Rao
3feb6492e6 fixed datasources icon (#5015) 2016-05-12 21:49:58 +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
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
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
bergquist
b8421a478f feat(alerting): move state filter to the right 2016-05-10 08:26:40 +02:00
bergquist
2ddffc8234 feat(alerting): add support for multiple state in ui 2016-05-09 16:32:35 +02:00
bergquist
9da2e6e907 feat(alerting): update path 2016-05-09 15:17:26 +02:00
bergquist
1be513fabd feat(alerting): add support for alert page filter 2016-05-09 14:44:44 +02:00
bergquist
3e462f2914 chore(alerting): style refactoring 2016-05-09 12:10:53 +02:00
bergquist
35c73902da Merge branch 'master' into alerting_definitions 2016-05-09 11:34:56 +02:00
bergquist
47070f2d1f chore(alerting): struct names and url refactoring 2016-05-09 11:25:21 +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
bergquist
27274f37e8 feat(alerting): update paths for alert state 2016-05-06 14:37:41 +02:00
Utkarsh Bhatnagar
70f7177025 Fixed deleting row bug (#4919) 2016-05-05 09:57:21 +02: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
bergquist
2ccb3956a6 feat(alerting): set default value for query 2016-05-03 17:55:41 +02:00
Torkel Ödegaard
bb6f4fff87 feat(export/import): minor progress 2016-05-03 16:40:21 +02:00
bergquist
4ea0e6ca93 feat(alerting): remove delete option from alerts page 2016-05-03 16:39:52 +02:00
bergquist
3c7e793c1f feat(alerting): add color to alert state icons 2016-05-03 16:36:49 +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
bergquist
1c082670c4 feat(alerting): make alertname link to status page 2016-05-02 18:06:17 +02:00
bergquist
7c5c7c6f32 feat(alerting): renames go to dashboard -> edit 2016-05-02 18:02:33 +02:00
bergquist
9083392341 feat(alerting): to straight for panel in alert link 2016-05-02 17:37:08 +02:00
bergquist
743a6fa37c feat(alerting): add support for deleting alert rules 2016-05-02 16:07:19 +02:00
bergquist
a573d2504c feat(alerting): pixels have been pushed 2016-05-02 15:37:18 +02:00
bergquist
05459de344 feat(alerting): add gf icons for alerts page 2016-05-02 15:31:40 +02:00
bergquist
3eab0cde70 feat(alerting): add gf icons for alert state page 2016-05-02 15:20:58 +02:00
bergquist
ca959d1ab0 Merge branch 'master' into alerting_definitions 2016-05-02 13:22:58 +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
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
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
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
bergquist
16cede30f6 feat(alerting): move alertingtab to seperate directive 2016-04-28 16:03:14 +02:00
bergquist
f442adca47 feat(alerting): adds api endpoints for alerts per dashboard and panel 2016-04-28 15:13:42 +02:00
bergquist
ecfbc2edca feat(alerting): adds alert history page 2016-04-28 11:42:03 +02:00
bergquist
5bc3672296 Merge branch 'master' into alerting_definitions 2016-04-28 11:03:33 +02:00
Torkel Ödegaard
5a241a8290 fix(): minor query editor fix 2016-04-28 10:29:36 +02:00
Torkel Ödegaard
0e4b70a4a8 feat(query_editors): more work 2016-04-28 10:13:18 +02:00
bergquist
3ecc13506c feat(alerting): adds alert state go ui 2016-04-28 08:53:34 +02:00
bergquist
e7be7d2835 feat(alerting): add api endpoint for alert state 2016-04-28 08:23:50 +02:00
Torkel Ödegaard
f1d4fd3e67 feat(query editors): changed chevron position 2016-04-27 21:24:41 +02:00
bergquist
6a5ecb3fca feat(alerting): adds basic page for listing alerts 2016-04-27 13:02:28 +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
bce5c447b3 fix(apps): app dashboards can now be updated, fixes #4817 2016-04-26 12:52:44 +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
1a433de0b4 Merge branch 'master' into query-editor-style 2016-04-25 14:22:36 +02:00
Dan Cech
25b0773a94 fix broken link to grafana.net, standardize on https://grafana.net for links 2016-04-22 12:13:39 -04: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
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
1069f485da ux(query_editors): handle text overflow in collapsed mode 2016-04-17 22:24:40 -04:00
Torkel Ödegaard
4c4835e869 ux(query-editors): more progress on elastic query editor 2016-04-17 22:04:43 -04:00
Torkel Ödegaard
805fd18b7b feat(query editors): more work on query editors make over 2016-04-17 16:43:13 -04:00
Torkel Ödegaard
33f7b8479e ux(query editors): progress on new query editor styles 2016-04-17 12:14:25 -04:00
Torkel Ödegaard
68bd82f1b6 Merge branch 'master' into query-editor-style 2016-04-16 13:46:05 -04:00
Torkel Ödegaard
13471ae2c4 feat(templating): templated ds progress 2016-04-16 13:43:16 -04:00
Torkel Ödegaard
822bf13b7a Merge pull request #4728 from grafana/code-style-improvements 
Code style improvements
 2016-04-16 12:09:40 -04:00
Torkel Ödegaard
1cce5fdfe1 feat(templating): polished variable template edit forms, added new template variable type: datasource 2016-04-16 12:03:29 -04:00
Torkel Ödegaard
6b2fedb1c2 Merge branch 'master' of github.com:grafana/grafana 2016-04-15 19:57:12 -04:00
Torkel Ödegaard
e307ada374 ux(): tooltip improvement 2016-04-15 19:56:39 -04:00
Torkel Ödegaard
4f2628c221 fix(): fixed issue with templating preview, fixes #4714 2016-04-15 18:50:48 -04:00
Torkel Ödegaard
0f16066915 fix(): zoom out tooltip fix, fixes #4729 2016-04-15 18:32:03 -04:00
Matt Toback
151d8db98d removed unnecessary style 2016-04-15 15:00:29 -04:00
Torkel Ödegaard
49b2743a37 Merge branch 'master' of github.com:grafana/grafana 2016-04-15 14:36:51 -04:00
Torkel Ödegaard
8e37de19c9 ux(): minor fix to tooltip in template editor view 2016-04-15 14:36:43 -04:00
Matt Toback
38bda92bdc Update dashnav.html 2016-04-15 13:26:27 -04:00
Torkel Ödegaard
0f71838fdf feat(dash export): dashboard export can now replace datasource names with variable and add inputs section 2016-04-14 21:13:01 -04:00
Torkel Ödegaard
4d0b14fbb4 feat(exporter): stared work on dashboard exporter that cleans up repeated panels etc 2016-04-14 17:31:34 -04:00
Torkel Ödegaard
1f9922a5aa refactor(): moved dashboard_srv and DashboardCtrl to typescript 2016-04-14 16:53:19 -04:00
Torkel Ödegaard
6355896584 fix(snapshots): Fixed issue with empty snapshots, fixes #4706 2016-04-14 11:06:48 -04:00
Torkel Ödegaard
7456514816 fix(templating): fixed issue with template variables that use regex extraction, fixes #4672 2016-04-13 16:41:19 -04:00
Torkel Ödegaard
ad0794cc59 ux(): updated light theme 2016-04-12 14:26:55 -04:00
Torkel Ödegaard
9868edb138 ux(): changed tooltip style 2016-04-12 13:00:33 -04:00
Torkel Ödegaard
e822fad505 fix(timepicker): fixed issues and added some polish to timepicker shift back/forward buttons 2016-04-12 12:41:17 -04:00
Torkel Ödegaard
3ab5427019 fix(timepicker): fixed issues and added some polish to timepicker shift back/forward buttons 2016-04-12 12:39:59 -04:00
Torkel Ödegaard
7afb6fa3e3 ux(ds edit): combine save and test connection buttons, closes #4658 2016-04-12 11:20:03 -04:00
bergquist
7d09579e3f feat(timepicker): adds arrows to move back and forth in current dashboard 
closes #119
 2016-04-12 16:21:29 +02:00
bergquist
e5c9a24c33 Merge branch 'master' into utkarshcmu-move 2016-04-12 16:21:20 +02:00
Torkel Ödegaard
905d31442c fix(annotations): make sure a data source that supports annotations is used in annotation editor when creating new 2016-04-12 10:16:40 -04:00
bergquist
963001ba1a Merge branch 'move' of https://github.com/utkarshcmu/grafana into utkarshcmu-move 2016-04-12 15:22:38 +02:00
Torkel Ödegaard
51aed2dbc6 Merge branch 'master' of github.com:grafana/grafana 2016-04-11 21:11:08 -04:00
Torkel Ödegaard
497e9343aa Merge branch 'pluginlist' 2016-04-11 21:10:54 -04:00
Torkel Ödegaard
6ce934f1dd feat(pluginlist): worked on plugin list 2016-04-11 20:33:58 -04:00
Matt Toback
f4fc3f48a7 New modal for upgrades and updated styles on list 2016-04-11 19:01:18 -04:00
Torkel Ödegaard
94729745dc change(apps): config tab is now default for app plugins, fixes #4573 2016-04-11 18:54:00 -04:00
Torkel Ödegaard
75649c49d5 Merge branch 'master' into wizard 2016-04-11 18:18:09 -04:00
Torkel Ödegaard
9c14b9672f fix(): admin stats and postgres 2016-04-11 18:16:35 -04:00
Torkel Ödegaard
31441f0b43 feat(dashlist): updated dashlist 2016-04-11 16:21:25 -04:00
Torkel Ödegaard
451a8bef39 feat(pluginslist): minor update 2016-04-11 14:17:38 -04:00
Torkel Ödegaard
ab34b174f9 Added update notice to plugin list 2016-04-11 13:42:52 -04:00
Torkel Ödegaard
5a81cf6c17 Merge branch 'master' of github.com:grafana/grafana 2016-04-11 09:27:30 -04:00
Torkel Ödegaard
a8f4b0227f fix(graph): Fixed issue with legend height in table mode with few series, affected iframe embedding as well, fixes #4640 2016-04-10 14:58:52 -04:00
Torkel Ödegaard
e8a209c9b5 fix(): removed obsolete call to setTimeQueryStart 2016-04-09 15:00:47 -04:00
Torkel Ödegaard
781fed1079 fix(mixed data source): fixed issue with mixed data sources in same graph, fixes #4604 2016-04-09 14:44:50 -04:00
Torkel Ödegaard
44cf66d7ff refactoring(): fixing event things 2016-04-07 19:23:20 -04:00
Torkel Ödegaard
b8baeac860 Merge branch 'master' of github.com:grafana/grafana 2016-04-07 11:00:56 -04:00
Torkel Ödegaard
a425ce0826 fix(graph panel): Fixed legend option max not updating, fixes #4601 2016-04-07 10:57:55 -04:00
bergquist
513aa61d17 fix(singlestat): start timer for refreshs 2016-04-07 12:01:43 +02:00
utkarshcmu
6a55ec6955 Changed time shift icons 2016-04-07 02:21:54 -07:00
utkarshcmu
e470786fb9 Backward and forward arrows for time shift 2016-04-07 01:30:49 -07:00
Torkel Ödegaard
0117d9eedb Merge branch 'master' of github.com:grafana/grafana 2016-04-06 12:52:19 -04:00
Torkel Ödegaard
cdb23cafa6 docs(): updated readme 2016-04-06 12:52:05 -04:00
Dieter Plaetinck
b7410ee718 clarify that this is only an example. fix 2 of #4576 2016-04-06 11:03:15 -04:00
utkarshcmu
58b76bac0d Removed unused option 2016-04-06 07:12:38 -07:00
Torkel Ödegaard
f8efee6c2a change(): updated placeholder text in data source edit view 2016-04-06 09:21:34 -04:00
Torkel Ödegaard
1666415620 fix(): fixed minor issue in data source info popover, fixes #4576 2016-04-06 09:13:49 -04:00
Torkel Ödegaard
7f8f5f3498 fix(): minor fix for plugin page, fixes #4578 2016-04-06 09:08:49 -04:00
Torkel Ödegaard
a27d72b437 fix(): fixed issue with scripted dashboard example, fixes #4579 2016-04-06 08:49:51 -04:00
Torkel Ödegaard
6bb001e416 Merge branch 'master' into query-editor-style 2016-04-04 13:55:55 -04:00
Torkel Ödegaard
43ebc172cb fix(profile): fixed change password link and page, fixes #4542 2016-04-04 13:52:41 -04:00
Torkel Ödegaard
f35eb0f148 fix(metrics tab): Fix for missing datasource name in datasource selector, fixes #4540 2016-04-03 16:19:14 -04:00
Torkel Ödegaard
6e6ebc5947 trying to fix karma issue 2016-04-03 09:43:33 -04:00
Torkel Ödegaard
b30b78e442 feat(preferences): got timezone option to work on org and profile level, as well as dashboard 2016-04-03 06:05:43 -07:00
Torkel Ödegaard
ab1048b7ee feat(preferences): theme and home dashbord settings now work work on profile and org settings page 2016-04-02 13:54:06 -07:00
Torkel Ödegaard
38a10f8be4 progress 2016-04-01 17:34:30 -07:00
Torkel Ödegaard
f165ba6480 Merge branch 'master' into preferences 2016-04-01 16:02:02 -07:00
Torkel Ödegaard
b85b5e00d4 fix(): fixed panel resize and fullscreen panel height issue 2016-03-30 21:26:54 -07:00
Torkel Ödegaard
4a807b6373 feat(preferences): still a lot more work needed in prefernces branch 2016-03-30 14:10:32 -07:00
Torkel Ödegaard
6ed9164c9d Merge branch 'master' of github.com:grafana/grafana into preferences 2016-03-30 13:35:17 -07:00
Torkel Ödegaard
b745726462 Merge branch 'master' of github.com:grafana/grafana 2016-03-30 00:16:15 +02:00
Torkel Ödegaard
3dbfd49414 ux(): templating forms polish 2016-03-29 22:24:08 +02:00
Torkel Ödegaard
d2239427f2 ux(): big progress on updating query editors 2016-03-29 19:03:24 +02:00
Torkel Ödegaard
a4f9621473 Merge branch 'master' into query-editor-style 2016-03-29 17:45:24 +02:00
woodsaj
2f3627e74b add missing ngInject comment. fixes #4501 2016-03-29 22:53:02 +08:00
Torkel Ödegaard
4871a8f43e refactor(graph): changed how graph stores panel yaxis options 2016-03-29 14:54:33 +02:00
Torkel Ödegaard
3e50ee6193 ux(): dashboard settings form polish, added on hover tooltip for checkbox directive 2016-03-29 11:01:00 +02:00
Torkel Ödegaard
14326b626e ux(): checkbox now works in dark and white theme 2016-03-28 13:10:42 +02:00
Torkel Ödegaard
1dabd68327 Merge branch 'master' into checkboxv3 2016-03-28 11:22:23 +02:00
Torkel Ödegaard
437b880b3e feat(plugins): work on setup wizard started 2016-03-25 22:14:29 +01:00
Torkel Ödegaard
61017fc204 feat(plugins): import all dashboards feature 2016-03-25 15:35:58 +01:00
Torkel Ödegaard
05cc370c55 feat(plugins): added disable button to app config tab 2016-03-25 13:43:13 +01:00
Torkel Ödegaard
963e202745 fix(): data push fix 2016-03-25 09:40:05 +01:00
Torkel Ödegaard
32a1d1445c refactor(): trying to move app events away from rootScope 2016-03-23 17:39:10 +01:00
Torkel Ödegaard
35c853e906 feat(plugins): fix for plugin logo to navbar on plugin page, #4452 2016-03-23 16:43:32 +01:00
Torkel Ödegaard
5dfac9a765 feat(plugins): added plugin logo to navbar on plugin page, #4452 2016-03-23 16:37:58 +01:00
Torkel Ödegaard
b3c073ab6c feat(panels): more panel refactoring, using events instead of overriding base class methods 2016-03-23 12:50:56 +01:00
Torkel Ödegaard
6a42b95d39 feat(panels): panel refactorings 2016-03-23 11:31:31 +01:00
Torkel Ödegaard
cb49e11eca feat(live): panel sdk/api refactorings 2016-03-22 21:27:53 +01:00
Torkel Ödegaard
8dee54bf5d feat(live): progress on panel <-> data source communication patterns 2016-03-22 18:21:21 +01:00
Torkel Ödegaard
d0564933a2 Merge branch 'master' into websocket 2016-03-22 10:42:41 +01:00
Torkel Ödegaard
03f91e8d85 fix(panel resize): fixed panel resize drag handling 2016-03-22 10:42:29 +01:00
Torkel Ödegaard
c711fb67c8 Merge branch 'master' into websocket 2016-03-22 10:31:57 +01:00
Torkel Ödegaard
10df9dc8c3 feat(plugins): finished app navigation enhancements, closes #4434 2016-03-22 10:15:47 +01:00
Torkel Ödegaard
64312ceded ux(): updated http settings view with new checkboxes 2016-03-21 21:36:30 +01:00
Torkel Ödegaard
98206ab49f ux(): created new gf-form-switch directive clean/refactoring 2016-03-21 21:24:06 +01:00
Torkel Ödegaard
56622ee2c6 Merge branch 'master' of github.com:grafana/grafana 2016-03-21 19:07:19 +01:00
Torkel Ödegaard
65c0937741 ux(): app navigation improvements, changes to plugin.json for apps, merged pages with includes section, #4434 2016-03-21 19:07:08 +01:00
Torkel Ödegaard
8498bfd2c2 Merge pull request #4436 from grafana/org-details-improvements 
Finishing touches
 2016-03-21 17:17:59 +01:00
Torkel Ödegaard
fc983f9751 ux(): checkbox v2 tweaks 2016-03-21 14:08:18 +01:00
Torkel Ödegaard
55189200a4 ux(): updated query editor test 2016-03-20 16:18:31 +01:00
Torkel Ödegaard
9e98c86ae1 Merge branch 'master' into preferences 2016-03-20 11:27:49 +01:00
Torkel Ödegaard
06468d6f43 Merge pull request #4368 from simnv/variable-escape 
Slash escape regex
 2016-03-20 11:22:33 +01:00
Torkel Ödegaard
1ccde201be feat(live datasouces): moved from Observable to Subject 2016-03-18 13:52:26 +01:00
bergquist
4c7f638f3c fix(datasources): fixes header condition 
closes #4402
 2016-03-18 09:48:26 +01:00
Matt Toback
6016033b8b Finishing touches 2016-03-17 15:14:26 -04:00
utkarshcmu
9dd6aefcec Minor corrections 2016-03-16 23:35:06 -07:00
Torkel Ödegaard
79a803ea8f feat(ds observable): minor progress on handling data source observable 2016-03-16 15:59:21 +01:00
Torkel Ödegaard
0f6579801d Merge branch 'master' into websocket 
Conflicts:
	public/app/core/core.ts
 2016-03-16 15:19:32 +01:00
Torkel Ödegaard
4144f71e23 Merge branch 'datasource-lists-cards' 2016-03-16 15:05:46 +01:00
Torkel Ödegaard
852ecd71f7 ux(): update data source list to card view, #4364 2016-03-16 15:05:07 +01:00
Torkel Ödegaard
a738945a88 feat(data source observerable): started work on handling data source observerable 2016-03-16 14:19:30 +01:00
Torkel Ödegaard
d26d7162a5 fix(opentsdb): fixed templating issue for single value variables, fixes #4312 2016-03-16 13:11:07 +01:00
bergquist
ed1864e076 feat(dashlist): stores recently visited dashboards per orgid 2016-03-16 11:52:25 +01:00
Torkel Ödegaard
a88176e060 feat(preferences): lots of refactoring and changes to #3214 2016-03-15 22:49:52 +01:00
Torkel Ödegaard
e06756bcab Merge branch 'preferences' of github.com:grafana/grafana into preferences 2016-03-15 22:15:27 +01:00
Torkel Ödegaard
e4c0c39fbf ux(): began work on updating data source list to cards view 2016-03-15 20:29:35 +01:00
Torkel Ödegaard
c411714546 ux(): added card layout selector and list view mode, #4364 2016-03-15 15:28:37 +01:00
simnv
be8ec24106 Slash escape regex 
Slash symbol "/" wasn't escaped when we chose variable from template dropdown, so we couldn't choose interface names like Gi9/10 when querying from influxdb.
 2016-03-15 16:05:32 +05:00
Torkel Ödegaard
b273cd1339 Merge branch 'master' into websocket 2016-03-15 09:52:36 +01:00
Torkel Ödegaard
82eb32a71e ux(): initial pass at new card / list design, #4364 2016-03-15 09:15:24 +01:00
Torkel Ödegaard
fbd94fc6ce feat(websockets): inital work on websockets, #4355 2016-03-14 11:59:51 +01:00
bergquist
953a07252a Revert "fix(datasource): fixes testdatasource bug" 
This reverts commit f77bd59e1d.
 2016-03-14 11:43:35 +01:00
bergquist
f77bd59e1d fix(datasource): fixes testdatasource bug 2016-03-14 11:33:38 +01:00