IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-14 17:43:35 -06:00
Code Issues Packages Projects Releases Wiki Activity
16,768 Commits 5,447 Branches 554 Tags 1.9 GiB
5b46c08844
Commit Graph

2921 Commits

Author SHA1 Message Date
Peter Holmberg
841bd5817d test for team member selector 2018-09-10 14:27:33 +02:00
Peter Holmberg
d494ebc730 flattened team state, tests for TeamMembers 2018-09-10 14:19:27 +02:00
Marcus Efraimsson
35a24032a7
Merge pull request #13208 from grafana/fix-dashboard-permissions 
fix: Dashboard permissions now shows correctly
 2018-09-10 14:00:55 +02:00
Torkel Ödegaard
6c90a53654 refactor: moved stuff into new features dir manage-dashboards 2018-09-10 13:59:31 +02:00
Torkel Ödegaard
e4d9620fc0 move: moved styleguide to admin 2018-09-10 13:38:45 +02:00
Torkel Ödegaard
17e99bb38a Merge branch 'master' of github.com:grafana/grafana 2018-09-10 13:29:57 +02:00
Torkel Ödegaard
34567bc4f1 moved folders from features into the main feature folder they belong to 2018-09-10 13:29:27 +02:00
Carl Bergquist
7e0637aa9d
Merge pull request #12260 from strohi/panelids-for-htmlbookmark 
added id tag to Panels for html bookmarking on longer Dashboards
 2018-09-10 13:01:35 +02:00
Torkel Ödegaard
9cfe2a7f5c fix: Dashboard permissions now shows correctly, fixes #13201 2018-09-10 11:35:59 +02:00
Torkel Ödegaard
6bdaf57ae7 refactor: changed AlertRuleItem pause action to callback 2018-09-10 09:29:53 +02:00
Peter Holmberg
59b3bfd342 team members, bug in fetching team 2018-09-07 18:01:59 +02:00
Torkel Ödegaard
a440d3510a renaming things in admin 2018-09-07 17:55:38 +02:00
Torkel Ödegaard
4391209f7b Merge branch 'master' into redux-poc2 2018-09-07 14:49:05 +02:00
Peter Holmberg
05bfc36516 Teampages page 2018-09-07 14:32:09 +02:00
Carl Bergquist
3c0b1ef581
Merge pull request #13170 from bergquist/alerting_default_setting 
make default values for alerting configurable
 2018-09-06 13:26:42 +02:00
bergquist
3ce89cad71 make default values for alerting configurable 2018-09-06 11:26:14 +02:00
Patrick O'Carroll
2b74b1c4d6 added radix rule and changed files to follow rule (#13153) 2018-09-05 16:51:31 +02:00
Peter Holmberg
f68ac20218 set search query action and tests 2018-09-05 16:49:36 +02:00
Peter Holmberg
7e340b7aa5 delete team 2018-09-05 15:32:51 +02:00
Peter Holmberg
167f009819 load teams and store in redux 2018-09-05 15:13:21 +02:00
Peter Holmberg
306c3e6c10 creating types, actions, reducer 2018-09-05 12:34:32 +02:00
Torkel Ödegaard
0aea60bf17 Merge branch 'master' into redux-poc2 2018-09-05 12:11:11 +02:00
Torkel Ödegaard
c9ae585d2a Merge branch '12918-no-conditional-assignment' 2018-09-05 12:09:32 +02:00
Torkel Ödegaard
dc236b5063 refatoring: minor changes to PR #13149 2018-09-05 12:09:16 +02:00
Torkel Ödegaard
00c0b71f3d Merge branch '12918-only-arrow-functions4' 2018-09-05 11:46:54 +02:00
Torkel Ödegaard
432e203df1 Merge branch '12918-only-arrow-functions3' 2018-09-05 11:26:30 +02:00
Patrick O'Carroll
777010b20b added no-conditional-assignment rule and changed files to follow new rule 2018-09-05 10:53:58 +02:00
Patrick O'Carroll
72ab24f300 Changed functions to arrow functions for only-arrow-functions rule. (#13131) 2018-09-05 07:47:30 +02:00
Torkel Ödegaard
68767acb1c fix: Updated test 2018-09-04 13:15:45 -07:00
Torkel Ödegaard
1e5ad4da78 redux: minor changes to redux thunk actions and use of typings 2018-09-04 12:59:46 -07:00
Marcus Efraimsson
7c88436a9b
Merge pull request #13133 from grafana/13132_query_variable 
Fix error when new variables created but not yet added/saved
 2018-09-04 17:25:08 +02:00
Patrick O'Carroll
dc4f547a40 Changed functions to arrow functions for only-arrow-functions rule. 2018-09-04 17:02:32 +02:00
Patrick O'Carroll
0f326f18dc changed functions to arrowfunctions for only-arrow-functions rule (#13127) 2018-09-04 15:55:41 +02:00
Peter Holmberg
22510be450 tests 2018-09-04 15:00:04 +02:00
Patrick O'Carroll
19b7ad61dd Changed functions to arrow functions for only-arrow-functions rule. 2018-09-04 14:27:03 +02:00
Marcus Efraimsson
1e74d7f20a
handle new variables created not yet added 2018-09-04 13:25:44 +02:00
Peter Holmberg
5ac5a08e9e Fixed a bug in the test and added test for filter alert rules 2018-09-04 09:53:24 +02:00
Peter Holmberg
f4594c8320 some basic selector tests 2018-09-03 16:58:11 +02:00
Peter Holmberg
638370e310 pausing alert 
need to fix return type on dispatch. Could not test correctly either.
 2018-09-03 15:44:39 +02:00
Marcus Efraimsson
1ceca5d8ec
Merge pull request #12145 from grafana/alerting_reminder 
Alerting notification reminder
 2018-09-03 14:41:38 +02:00
Peter Holmberg
c958ebd101 extend from purecomponent 2018-09-03 14:05:12 +02:00
Peter Holmberg
1994ca5016 remove log 2018-09-03 14:04:44 +02:00
Peter Holmberg
50444c32e0 actions and reducers for search filter 2018-09-03 13:46:39 +02:00
Patrick O'Carroll
b8d82df97e added no-angle-bracket-type-assertion rule and updatet files to follow rule (#13115) 2018-09-03 11:30:44 +02:00
Patrick O'Carroll
7837ee4466 Updated rules for variable name (#13106) 
* updated rules for variable name and fixed files that didn't follow new rules

* fixed test so it uses new rule

* made exceptions to rule in interval_variable
 2018-09-03 11:00:46 +02:00
Torkel Ödegaard
42aaa2b907 redux: improved state handling 2018-09-02 12:14:41 -07:00
Torkel Ödegaard
3fd707f321 redux: progress 2018-09-02 12:08:31 -07:00
Torkel Ödegaard
2a64d19f5b wip: load alert rules via redux 2018-09-02 11:36:03 -07:00
Torkel Ödegaard
7b06800295 refactor: changed nav store to use nav index and selector instead of initNav action 2018-09-02 10:36:36 -07:00
Torkel Ödegaard
2ac202b22f moving things around 2018-09-02 07:11:21 -07:00
Torkel Ödegaard
de456f8b73 wip: solid progress on redux -> angular location bridge update 2018-08-31 13:16:20 -07:00
Torkel Ödegaard
6efe9da10f wip: moving things around 2018-08-31 09:49:32 -07:00
Torkel Ödegaard
2c85e44ab7 wip: moveing things around 2018-08-31 09:49:02 -07:00
Torkel Ödegaard
593cc5380f wip: redux refactor 2018-08-31 09:42:32 -07:00
Patrick O'Carroll
abbb6f933c added jsdoc-format rule and fixed files that didn't follow new rule (#13107) 2018-08-31 16:40:43 +02:00
Patrick O'Carroll
944c1da27b set member-access and no-var-keyword to true, removed public in two files (#13104) 2018-08-31 16:40:23 +02:00
Torkel Ödegaard
d68007fde3 wip: redux 2018-08-31 14:38:23 +02:00
Torkel Ödegaard
cf58eea1db redux: wip progress for using redux 2018-08-31 13:24:36 +02:00
Torkel Ödegaard
154fbe2413
New TV Mode, dashboard toolbar update (layout change & new cycle view mode button) (#13025) 
* wip: design update for navbar with kiosk mode button

* feat: progress on new view mode button

* css: view state refactorings

* feat: kiosk modes & playlist support

* feature: cycle tv mode feature, renamed view modes to TV, and Kiosk

* fix: updated the alert notification message

* fix: removed unused parameter

* fix: correct the css class set for tv mode

* some minor improvements to playlist
 2018-08-30 11:52:31 +02:00
Torkel Ödegaard
36bc8b77fb Merge branch 'tsconfig-no-implicit-this' 2018-08-30 11:46:13 +02:00
Patrick O'Carroll
a8547ae36e added this:any to functions and changed functions to arrowfunctions 2018-08-30 10:49:18 +02:00
Patrick O'Carroll
552a61b6ae changed var to let in 50 files (#13075) 2018-08-30 09:03:11 +02:00
Patrick O'Carroll
b494a29e02 changed var to let in last files (#13087) 2018-08-30 08:58:43 +02:00
Torkel Ödegaard
c960af098a tslint: added 1 more rule, #12918 2018-08-30 07:47:46 +02:00
Patrick O'Carroll
a702603e7b changed var to const 2 (#13068) 
* changed var to const

* fixed typo created in last commit

* added or empty object to options in prometheus/datasource
 2018-08-29 14:27:29 +02:00
Patrick O'Carroll
5e0d0c5816 changed var to const (#13061) 2018-08-29 14:26:50 +02:00
Patrick O'Carroll
b8597b4d57 added empty cta to playlist page + hid playlist table when empty (#12841) 
* added empty cta to playlist page + hid playlist table when empty

* implemented the empty-list-cta component

* removed extra protip, changed messaging
 2018-08-28 14:23:03 +02:00
Torkel Ödegaard
e1beaaa0f7
tslint: tslint to const fixes part3 (#13036) 2018-08-26 21:52:57 +02:00
Torkel Ödegaard
35c00891e7
tslint: more const fixes (#13035) 2018-08-26 20:19:23 +02:00
Torkel Ödegaard
314b645857
tslint: changing vars -> const (#13034) 2018-08-26 18:43:07 +02:00
Torkel Ödegaard
9b978b7203
tslint: autofix of let -> const (#13033) 2018-08-26 17:14:40 +02:00
Marcus Efraimsson
6995242b8b
copy and docs update for alert notification reminders 2018-08-24 19:13:52 +02:00
Marcus Efraimsson
49f9276df0
Merge pull request #12967 from franciscocpg/custom-all-value-variable-interpolation 
Replacing variable interpolation in "All value" value
 2018-08-24 15:40:55 +02:00
Alexander Zobnin
060fb1af05 tests: fix missing tests (with .jest suffix) 2018-08-23 13:00:15 +03:00
Marcus Efraimsson
34e448c6d4
Merge remote-tracking branch 'origin/master' into alerting_reminder 2018-08-22 18:08:50 +02:00
Marcus Efraimsson
15d950ce35
update copy/ux for configuring alerting notification reminders 2018-08-22 18:06:05 +02:00
Marcus Efraimsson
775e95bde4
Merge pull request #12959 from grafana/11890_variables 
Fix: Template variables are executing excessive queries
 2018-08-21 10:40:47 +02:00
Marcus Efraimsson
470e7cc6db
add suggestions for reminder frequency and change copy 2018-08-20 18:23:48 +02:00
Marcus Efraimsson
6d2136b853
Merge remote-tracking branch 'origin/master' into alerting_reminder 2018-08-20 13:29:30 +02:00
Francisco Guimarães
0223a75de0 Refresh query variable when another variable is used in regex field (#12961) 2018-08-20 11:56:12 +02:00
Francisco Guimarães
d58986872c Replacing variable interpolation in "All value" value 2018-08-17 11:04:32 -03:00
Marcus Efraimsson
d6ad1ced6d
when value in variable changes, identify which variable(s) to update 
Given you have variables a, b, c, d where b depends on a, c depends on b, c, d depends on a.
When updating a only an update of b and d should be triggered since c depends on b
and c will be updated eventually when the update of b are finished.
 2018-08-17 12:20:21 +02:00
Marcus Efraimsson
660530a3a6
Merge pull request #12914 from dehrax/12224-final 
Karma to Jest: rename and cleanup
 2018-08-14 12:55:23 +02:00
Marcus Efraimsson
77ee032e41
Merge pull request #12809 from dehrax/12224-share-modal-ctrl 
Karma to Jest: share_modal_ctrl
 2018-08-14 10:57:15 +02:00
Tobias Skarhed
a65589a5fb Rename test files 2018-08-14 10:52:41 +02:00
Marcus Efraimsson
8dbc75ceea
Merge pull request #12844 from grafana/10705_dash_links 
Use uid when linking to dashboards internally in a dashboard
 2018-08-14 09:16:43 +02:00
Tobias Skarhed
fa6d25af72 Remove comment 2018-08-13 16:36:22 +02:00
Tobias Skarhed
be7b663369 Cleanup 2018-08-13 16:36:22 +02:00
Tobias Skarhed
38422ce8a4 All tests passing 2018-08-13 16:36:22 +02:00
Tobias Skarhed
35694a76ef Class to function. Half tests passing 2018-08-13 16:36:22 +02:00
Marcus Efraimsson
d110343e53
Merge pull request #12838 from grafana/12476-show-teams-on-profile 
show teams on profile
 2018-08-13 15:16:04 +02:00
Patrick O'Carroll
535bab1baa now hides team header when no teams + fix for list hidden when only one team 2018-08-13 15:07:29 +02:00
Pierre GIRAUD
d7fb704e27
Convert URL-like text to links in plugins readme 2018-08-08 16:07:33 +02:00
Marcus Efraimsson
e97251fe28
skip target _self to remove full page reload 2018-08-08 16:01:35 +02:00
Marcus Efraimsson
8dfe4a97ef
use uid when linking to dashboards internally in a dashboard 2018-08-08 16:01:01 +02:00
Patrick O'Carroll
a94406ac53 added more info about the teams 2018-08-08 11:22:47 +02:00
Patrick O'Carroll
ca06893e69 removed mock-teams, now gets teams from backend 2018-08-08 10:50:27 +02:00
Patrick O'Carroll
b0ddc15e1a team list for profile page + mock teams 2018-08-08 09:23:36 +02:00
Marcus Efraimsson
cfe81510f9
Merge pull request #12796 from dehrax/12768-panel-heights 
WIP: Fit panels to screen height
 2018-08-07 15:57:40 +02:00
Tobias Skarhed
9f87f6081a Remove Karma test 2018-08-06 11:23:50 +02:00
Tobias Skarhed
46dd4eba9e All tests passing 2018-08-06 11:23:50 +02:00
Tobias Skarhed
034ca69610 Add mock constructor 2018-08-06 11:23:50 +02:00
Tobias Skarhed
7f4723a9a7 Begin conversion 2018-08-06 11:23:50 +02:00
Torkel Ödegaard
624f3a0173 refactor: take submenu into account PR #12796 2018-08-05 11:39:46 +02:00
Torkel Ödegaard
b1b8a38061 refactor: renaming variables, refactoring PR #12796 2018-08-05 11:39:46 +02:00
Torkel Ödegaard
013f8cd8ea refactor: moving code around a bit, refactoring PR #12796 2018-08-05 11:39:46 +02:00
Tobias Skarhed
f00b5eee83 Remove weird import 2018-08-05 11:39:46 +02:00
Tobias Skarhed
4b84a58575 Disable submenu when autopanels is enabled 2018-08-05 11:39:46 +02:00
Tobias Skarhed
36c406eefb Extract to own method 2018-08-05 11:39:46 +02:00
Tobias Skarhed
1618b095c7 Use and add keybard shortcut 2018-08-05 11:39:46 +02:00
Tobias Skarhed
63fa9fdc6d Add temporary url parameter 2018-08-05 11:39:46 +02:00
Tobias Skarhed
338a37abc8 Replace floor with round 2018-08-05 11:39:46 +02:00
Tobias Skarhed
9e4748e2aa Go with just single margin compensation 2018-08-05 11:39:46 +02:00
Tobias Skarhed
78b3dc40f1 Add margin and padding compensation 2018-08-05 11:39:46 +02:00
Tobias Skarhed
a9f24bb36d Remove weird import 2018-08-05 11:39:45 +02:00
Tobias Skarhed
818fe09a7f Fit panels to screen height 2018-08-05 11:39:45 +02:00
Tobias Skarhed
61eb96ed79 Remove simple tests 2018-08-03 12:34:13 +02:00
Patrick O'Carroll
1bb5a57036 frontend part with mock-team-list 2018-07-27 13:45:16 +02:00
Tobias Skarhed
35cc85bfcc All tests passing. Remove Karma test. 2018-07-26 09:36:46 +02:00
Tobias Skarhed
931b944cdd Almost all tests passing 2018-07-25 17:38:45 +02:00
Tobias Skarhed
7d51c15240 Two passing tests 2018-07-25 16:15:03 +02:00
Tobias Skarhed
f350461206 Start conversion 2018-07-25 14:52:03 +02:00
David Kaltschmidt
3297ae462d Datasource for Grafana logging platform 
- new builtin datasource plugin "Logging" (likely going to be renamed)
- plugin implements no panel ctrls yet, only ships datasource
- new models for logging data as first class citizen (aside from table
  and time_series model)
- Logs as new view for Explore
- JSON view for development

Testable only against existing logish deployment.
Then test with queries like `{job="..."} regexp`.
 2018-07-20 17:07:17 +02:00
David
bfd05ba6ec
Merge pull request #12617 from grafana/davkal/prometheus-value-formatting 
Make prometheus value formatting more robust
 2018-07-18 17:11:16 +02:00
Torkel Ödegaard
a4587cdeee fix: datasource search was not working properly 2018-07-18 14:28:38 +02:00
Daniel Lee
3cb95fb40a pluginloader: expose flot gauge plugin 2018-07-18 12:05:45 +02:00
David Kaltschmidt
c6e9ffb168 Use url params for explore state 
- putting state in the path components led to 400 on reload
- use `/explore?state=JSON` instead
 2018-07-17 12:56:05 +02:00
David Kaltschmidt
1f74b298c4 Remove string casting for template variables in prometheus 2018-07-16 13:02:36 +02:00
Torkel Ödegaard
c6bcf13d78
Devenv testdata dashboards (#12615) 
* devenv: working on dev env setup & dashboards

* devenv: refactored testdata app to a built in datasource instead, and moved dashboards to a devenv provisioned dashboards
 2018-07-16 03:12:13 -07:00
David Kaltschmidt
eb2abe800b Reverted $q to Promise migration in datasource_srv 2018-07-13 22:28:14 +02:00
David Kaltschmidt
d06b26de26 Explore Datasource selector 
Adds a datasource selector to the Explore UI. Only datasource plugins
that have `explore: true` in their `plugin.json` can be selected.

- adds datasource selector (based on react-select) to explore UI
- adds getExploreSources to datasource service
- new `explore` flag in datasource plugins model
- Prometheus plugin enabled explore
 2018-07-13 09:09:36 +02:00
David Kaltschmidt
81e62e1051 Fix freezing browser when loading plugin 
- broken since 4d2dd2209
- `*` was previously working as a path matcher, but freezes browser when
  used with new cache-busting plugin loader
- changed matcher to be `/*`
 2018-07-12 13:16:41 +02:00
Torkel Ödegaard
c03764ff8a
Refactor team pages to react & design change (#12574) 
* Rewriting team pages in react

* teams to react progress

* teams: getting team by id returns same DTO as search, needed for AvatarUrl

* teams: progress on new team pages

* fix: team test

* listing team members and removing team members now works

* teams: team member page now works

* ux: fixed adding team member issue

* refactoring TeamPicker to conform to react coding styles better

* teams: very close to being done with team page rewrite

* minor style tweak

* ux: polish to team pages

* feature: team pages in react & everything working

* fix: removed flickering when changing tabs by always rendering PageHeader
 2018-07-11 11:23:07 -07:00
Mitsuhiro Tanda
18a8290c65 (prometheus) prevent error to use $__interval_ms in query (#12533) 
* prevent error to use $__interval_ms in query

* add test

* prevent error to use $__interval_ms in query
 2018-07-11 11:13:47 -07:00
Torkel Ödegaard
b4e0ace7a2
fix: folder picker did not notify parent that the initial folder had been changed, fixes #12543 (#12554) 2018-07-11 10:58:06 -07:00
Łukasz Gryglicki
24f395f986 Add support for skipping variable value in URL, fixes #12174 (#12541) 
* New rebase

Signed-off-by: Lukasz Gryglicki <lukaszgryglicki@o2.pl>

* Lint

Signed-off-by: Lukasz Gryglicki <lukaszgryglicki@o2.pl>
 2018-07-11 10:06:36 -07:00
Tobias Skarhed
cfa555b569 Add folder name to dashboard title (#12545) 
* Add folder name to dashboard title. No display on medium displays and below

* Compare folderId instead

* folderId bigger than 0
 2018-07-11 03:31:07 -07:00
David
4d2dd22095 Fix css loading in plugins (#12573) 
- allow css loader to be imported again (wasnt prefixed by plugin)
 2018-07-11 03:29:19 -07:00
David Kaltschmidt
7ddcaf22d5 Fix datasource sorting with template variables 
- fixes sorting when template variables are present
- simplified existing test cases
- added test to cover variable usage in datasource service
 2018-07-06 15:32:08 +02:00
Marcus Efraimsson
5e4d6958d6
fix links not updating after changing variables 2018-07-06 11:54:37 +02:00
Marcus Efraimsson
50a522d418
fix caret for help button is ds http settings 2018-07-05 13:01:10 +02:00
Torkel Ödegaard
b8724ae0c4
refactoring: enterprise build/hooks refactorings (#12478) 2018-07-02 04:33:39 -07:00
Tobias Skarhed
2941dff428 Karma to Jest: datasource_srv (#12456) 
* Karma to Jest: datasource_srv

* Sort function differs between Karma and Jest

* Fix error based on .sort() implementation

* Remove Karma test

* alerting: only log when screenshot been uploaded

* Remove comments

* Karma to Jest: datasource_srv

* Sort function differs between Karma and Jest

* Fix error based on .sort() implementation

* Remove Karma test

* Remove comments

* Remove console.log

* Remove console.log

* Change sorting and add test for default data source
 2018-07-02 04:18:23 -07:00
Mitsuhiro Tanda
aa1b5959da omit extra template refresh (#12454) 2018-07-01 22:56:24 -07:00
Carl Bergquist
861af4cb97 Improve extensions build. (#12461) 
* enable ee build on pr/master

* step1: of including group sync

* disable commit pinning for now

* fixes broken build

* enable team to ldap group sync

* avoid returning error for missing external handler

* services: allow routes to be added before http server start

* services: allows services to add their own migrations

* moves db migrations to ee code base

* build using master branch in ee

* disable enterprise build in .bra.toml

[skip ci]

* removes team sync extensions

* removes commented line
 2018-07-01 07:01:43 -07:00
bergquist
d31c7bc6a4 Merge branch 'master' into alerting_reminder 
* master: (95 commits)
  registry: adds more comments
  registry: adds comments to interfaces
  changelog: update
  changelog: update
  changelog: add notes about closing #12438
  alerting: only log when screenshot been uploaded
  fixes typos
  changelog: add notes about closing #12444
  Revert "auth proxy: use real ip when validating white listed ip's"
  changelog: adds note for #11892
  changelog: add notes about closing #12430
  fix footer css issue
  Karma to Jest: 3 test files (#12414)
  fix: log close/flush was done too early, before server shutdown log message was called, fixes #12438
  Karma to Jest: value_select_dropdown (#12435)
  support passing api token in Basic auth password (#12416)
  Add disabled styles for checked checkbox (#12422)
  changelog: add notes about closing #11920
  changelog: add notes about closing #11920
  changelog: update
  ...
 2018-06-29 15:44:20 +02:00
Tobias Skarhed
af0a4a6039 Karma to Jest: 3 test files (#12414) 
* Karma to Jest: viewstate_srv

* Karma to Jest: annotations_srv

* Remove comments

* Karma to Jest: series_override_ctrl

* Remove unnecessary code

* Class to function and fix lint error

* Fix ngInject
 2018-06-28 04:43:23 -07:00
Marcus Efraimsson
5280084480
set correct text in drop down when variable is present in url using key/values 2018-06-25 14:59:28 +02:00
rozetko
97db9ece98 Set $rootScope in DatasourceSrv 2018-06-22 16:17:02 +03:00
Daniel Lee
75e378b689
Merge pull request #12367 from dehrax/12224-history-ctrl 
Karma to Jest: history_ctrl
 2018-06-21 14:52:01 +02:00
Carl Bergquist
828fb39ee2
Merge pull request #11643 from mrsiano/generic_oauth 
Pass configured/auth headers to a Datasource.
 2018-06-21 14:21:59 +02:00
mrsiano
cc1e3a0e3c Pass configured/auth headers to a Datasource. 
In some setups (ex openshift), the Datasource will require Grafana
to pass oauth token as header when sending queries.
Also, this PR allow to send any header which is something
Grafana currently does not support.
 2018-06-21 14:58:05 +03:00
Tobias Skarhed
4c31173853 Karma to Jest: history_ctrl. .gitingore: .vs/ 2018-06-21 11:54:47 +02:00
Tobias Skarhed
d00e2c20cf Karma to Jest: history_ctrl. Update version: ts-jest 2018-06-20 15:25:57 +02:00
Marcus Efraimsson
051ddb245d
Merge pull request #12346 from grafana/12256_export 
Make sure to process panels in collapsed rows when exporting dashboard
 2018-06-20 13:17:32 +02:00
Marcus Efraimsson
4ef4a4d3a7
dashboard: fix drop down links 2018-06-20 12:41:11 +02:00
Marcus Efraimsson
41ac8d4cd5
fix regressions after save modal changes of not storing time and variables per default 
Fix problem with adhoc variable filters not handled.
Fix problem with saving variables and time per default when saving a
dashboard as/first time.
Fix updating dashboard model after save with saving time/variables
enabled so that next time you save you won't get checkboxes for save
time/variables unless any values changed.
Tests validating correctness if time/variable values has changed.
 2018-06-20 09:52:29 +02:00
Tobias Skarhed
3a9a36d6cf Karma to Jest: history_srv (#12341) 
* Karma to Jest: history_srv

* Fix TS errors

* Remove q, as it is not needed
 2018-06-19 08:05:49 -07:00
Marcus Efraimsson
a2e08dc4e8
make sure to process panels in collapsed rows when exporting dashboard 2018-06-19 16:56:14 +02:00
Tobias Skarhed
8666c77cc9 Karma to Jest: time_srv (#12303) 
* Begin Karma to Jest: time_srv

* Remove experimental fix

* location search stubs for each test

* Fix issue where time service was not available for other tests
 2018-06-18 09:47:23 -07:00
Tobias Skarhed
5bf72fc9f4 Karma to Jest: team_details_ctrl (#12321) 2018-06-18 07:54:56 -07:00
bergquist
ffda5efc66 Merge branch 'master' into alerting_reminder 
* master:
  changelog: add notes about closing #11076
  snapshot: copy correct props when creating a snapshot
  set current org when adding/removing user to org
  changelog: add notes about closing #10707
  Include the vendor directory when copying source in to Docker (#12305)
  changelog: adds note about closing #12199
  adds inTransactionCtx that calls inTransactionWithRetryCtx
  merge create user handlers
  transactions: start sessions and transactions at the same place
  cloudwatch: handle invalid time range
  make sure to use real ip when validating white listed ip's
  changelog: adds note about closing #12286
 2018-06-18 11:26:31 +02:00
Marcus Efraimsson
9271e48513
Merge pull request #12317 from grafana/12278_snapshot_annotations 
Copy correct annotation props when creating a snapshot
 2018-06-18 11:24:04 +02:00
Marcus Efraimsson
a738347957
snapshot: copy correct props when creating a snapshot 2018-06-18 11:04:16 +02:00
André Niemann
757e2b0b7e added comment to reason the id tag 2018-06-18 10:59:44 +02:00
Marcus Efraimsson
6d48d0a80c
set current org when adding/removing user to org 
To not get into a situation where a user has a current organization assign which he is
not a member of we try to always make sure that a user has a valid current organization
assigned.
 2018-06-18 09:30:01 +02:00
bergquist
72224dbe37 adds info about eval/reminder interval 2018-06-15 16:53:35 +02:00
bergquist
6cd83e182a Merge branch 'master' into alerting_reminder 
* master: (84 commits)
  docs: adds info about grafana-dev container
  changelog: add notes about closing #12282
  Added Litre/min and milliLitre/min in Flow (#12282)
  remove papaparse dependency
  list name is deleteDatasources, not delete_datasources
  remove internal influx ifql datasource
  Document the endpoint for deleting an org
  tests: rewrite into table tests
  influxdb: adds mode func to backend
  changelog: add notes about closing #11484
  changelog: add notes about closing #11233
  Remove import
  Fix PR feedback
  Removed papaparse from external plugin exports
  Karma to Jest: query_builder
  dsproxy: move http client variable back
  Karma to Jest: threshold_mapper
  Expose react and slate to external plugins
  Karma to Jest: threshold_manager
  Karma to Jest: query_def, index_pattern
  ...
 2018-06-15 12:45:35 +02:00
Marcus Efraimsson
f0254c201a
Merge pull request #12215 from ryantxu/use-ng-if-for-time 
use ng-if for the panel timeInfo
 2018-06-15 12:16:48 +02:00
David Kaltschmidt
d5196ab322 remove internal influx ifql datasource 2018-06-14 20:42:33 +01:00
Marcus Efraimsson
56628996b7
Merge pull request #12280 from dehrax/12224-elastic-response 
karma to jest: 6 test files
 2018-06-14 17:24:36 +02:00
Marcus Efraimsson
1626a66bab
Merge pull request #12275 from dehrax/12224-exporter 
karma to jest: exporter, playlist_edit_ctrl
 2018-06-14 15:10:06 +02:00
Tobias Skarhed
23abf044ff Fix PR feedback 2018-06-14 14:37:48 +02:00
David Kaltschmidt
5ec7d60e5f Removed papaparse from external plugin exports 2018-06-14 13:22:16 +01:00
Tobias Skarhed
283b39c397 Karma to Jest: threshold_mapper 2018-06-14 13:38:03 +02:00
David Kaltschmidt
eb686c06f2 Expose react and slate to external plugins 
Experimental support for react in external plugins

- react
- slate (editor)
- papaparse (csv parsing)
- prismjs (syntax highlighting)

This is needed for new external datasource plugins like Flux
 2018-06-14 12:32:57 +01:00
Patrick O'Carroll
9802d86783
Merge pull request #12189 from ryantxu/focus-panel-search 
autoFocus the add-panel search filter, and add on enter
 2018-06-14 09:54:41 +02:00
Tobias Skarhed
a3552a60e1 Improve test readability 2018-06-14 09:46:36 +02:00
Tobias Skarhed
4dd9b8f324 Karma to Jest: playlist_edit_ctrl 2018-06-13 16:29:50 +02:00
Tobias Skarhed
94b8cbdc6a Karma to Jest: exporter 2018-06-13 15:15:36 +02:00
Marcus Efraimsson
2288e01752
Merge pull request #12169 from alexanderzobnin/feat-10796 
Import dashboard to folder
 2018-06-13 13:10:52 +02:00
André Niemann
23c97d080f added id tag to Panels for html bookmarking on longer Dashboards 2018-06-13 10:07:47 +02:00
Alexander Zobnin
25504e84ed
dashboard import to folder: minor fixes 2018-06-13 10:44:37 +03:00
Carl Bergquist
d3a3e7cfd1
Merge pull request #12222 from PrincipalsOffice/remove-QueryOptionsCtrl-references 
removed QueryOptionsCtrl references
 2018-06-13 09:34:02 +02:00
Patrick O'Carroll
0bb30b146c save-modal save button (#12047) 
Disable save dashboard button when saving
 2018-06-12 11:54:50 +02:00
Jiang Ye
c92874875c removed QueryOptionsCtrl references 2018-06-09 16:06:03 -04:00
ryan
0a3ec93347 use ng-if 2018-06-08 15:49:30 +02:00
Marcus Efraimsson
3fb4eb7322
Merge pull request #12175 from grafana/davkal/12168-fix-explore-setting 
Respect explore settings in config ini
 2018-06-07 12:08:42 +02:00
ryan
09dbb52423 Merge remote-tracking branch 'grafana/master' into focus-panel-search 
* grafana/master:
  nicer collapsed row behaviour (#12186)
  remove DashboardRowCtrl (#12187)
  Annotations support for ifql datasource
  Template variable support for ifql datasource
  Query helpers for IFQL datasource
 2018-06-07 10:31:46 +02:00
Ryan McKinley
17a2ce13f0 nicer collapsed row behaviour (#12186) 
* nicer collapsed row behavior

* don't block events

* use a div to toggle

* use singular name
 2018-06-06 21:58:42 -07:00
Ryan McKinley
415ad8fbf3 remove DashboardRowCtrl (#12187) 2018-06-06 21:57:30 -07:00
ryan
c71608aae8 add panel on enter 2018-06-07 03:08:39 +02:00
ryan
37c45a81a9 autoFocus the search filter 2018-06-07 02:48:54 +02:00
Alexander Zobnin
8fd3015e52
dashboard: improve import UX for non-editor users 
validate folderId, import only into available folders
 2018-06-06 15:35:19 +03:00
David Kaltschmidt
3bd58446d6 Fix metrics panel test by adding config mock 2018-06-06 11:15:24 +02:00
David Kaltschmidt
661503f828 Respect explore settings in config ini 
Previous explore restrictions only took permissions into consideration.

* add `exploreEnabled` to global settings
* only bind `x` if enabled
* only show explore in panel menu if enabled
 2018-06-06 10:50:47 +02:00
Alexander Zobnin
4ff4ac1d5f
dashboard: import into current folder from manage folder page 2018-06-05 20:01:48 +03:00
Alexander Zobnin
4063ae37a4
dashboard: import to folder 2018-06-05 19:23:09 +03:00
David
45a156577c
Merge pull request #12143 from grafana/davkal/ifql-datasource 
InfluxDB IFQL datasource (beta)
 2018-06-05 14:23:21 +02:00
bergquist
7333d7b8d4 alerting: invert sendOnce to sendReminder 2018-06-05 10:44:17 +02:00