IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
17,394 Commits 5,454 Branches 554 Tags 1.9 GiB
e39e82949d
Commit Graph

3106 Commits

Author SHA1 Message Date
David Kaltschmidt
c3e0d4205c Make Explore a pure component 2018-09-28 17:38:50 +02:00
Peter Holmberg
8f99276606 first crude display 2018-09-28 17:21:00 +02:00
David Kaltschmidt
200784ea4a Explore: Store UI state in URL 
Storing queries, split state, and time range in URL.

- harmonize query serialization when generating Explore URLs in
  dashboards (use of `renderUrl`)
- move URL parse/serialization to Wrapper
- keep UI states under two keys, one for left and one for right Explore
- add option to angular router to not reload page on search change
- add lots of types
- fix time service function that gets triggered by URL change
 2018-09-28 16:44:07 +02:00
Daniel Lee
9b90b835b2 Merge remote-tracking branch 'origin/master' into stackdriver-plugin 2018-09-28 16:20:40 +02:00
Peter Holmberg
da856187d8 snaps 2018-09-28 14:57:56 +02:00
Peter Holmberg
21cfc11009 implemented general actionbar 2018-09-28 14:34:58 +02:00
Peter Holmberg
3081e0f84a Merge branch 'master' into 13411-react-api-key 2018-09-28 13:10:55 +02:00
Peter Holmberg
e50a87aec9 using constant 2018-09-28 12:58:01 +02:00
Peter Holmberg
7ae4076ddd added no datasources added 2018-09-28 11:29:18 +02:00
Peter Holmberg
166f93cf54 components, test, removed old not used files 2018-09-28 11:05:34 +02:00
Torkel Ödegaard
5eede26a24
Merge pull request #13438 from grafana/plugin-list-to-react 
Plugin list to react
 2018-09-27 15:50:55 +02:00
Peter Holmberg
11ee65d35a deletez 2018-09-27 14:51:00 +02:00
Torkel Ödegaard
7d44aacf4a refactoring: slight changes to PR #13247 2018-09-27 14:50:14 +02:00
Peter Holmberg
b899a0e1c1 revert rename 2018-09-27 14:45:36 +02:00
Torkel Ödegaard
f2307f92de Merge branch 'text_variable-3173' of https://github.com/daldoyle/grafana into daldoyle-text_variable-3173 2018-09-27 14:36:37 +02:00
Peter Holmberg
327cdf34d5 using constant 2018-09-27 14:32:54 +02:00
Peter Holmberg
fede5e6c74 rename to pluginlistitem 2018-09-27 14:23:46 +02:00
Peter Holmberg
cabc4c4bfe fixing types 2018-09-27 14:19:36 +02:00
Peter Holmberg
1e2c06083a rewrote to use react.sfc 2018-09-27 12:15:41 +02:00
Torkel Ödegaard
5c24fa68a5 explore: fixes to dark theme, fixes #13349 2018-09-27 11:57:28 +02:00
Johannes Schill
362010c438 Remove angular code related to API Keys and point the route to the React component #13411 2018-09-27 11:53:19 +02:00
Johannes Schill
c7fb6916b9 Open modal with API key information after key is added #13411 2018-09-27 11:53:19 +02:00
Johannes Schill
a94662c8c7 Add tests for the reducers & selectors for API keys #13411 2018-09-27 11:53:19 +02:00
Johannes Schill
32fb24f248 Update test-snapshot, remove dead code #13411 2018-09-27 11:53:19 +02:00
Johannes Schill
60866d16b1 Add tests for ApiKeysPage #13411 2018-09-27 11:53:19 +02:00
Johannes Schill
e3d579e410 Add "search box" and a "add new" box to the new API Keys page #13411 2018-09-27 11:53:19 +02:00
Johannes Schill
cc0802cc39 Pick up the type from app/types 2018-09-27 11:53:19 +02:00
Johannes Schill
353a836128 wip: Reactify the api keys page #13411 2018-09-27 11:53:18 +02:00
Torkel Ödegaard
31b8bf2d47
Merge pull request #13380 from grafana/13275-pending-invites 
switch button for org users
 2018-09-27 11:26:07 +02:00
Torkel Ödegaard
283f693600 fix: also set dashboard refresh to false 2018-09-26 13:13:00 -07:00
Torkel Ödegaard
0f4904038e simplified fix for 12030 2018-09-26 13:08:55 -07:00
Jiang Ye
4c4e5533a1 prevent refresh on fixed time window 2018-09-26 13:08:55 -07:00
Daniel Lee
66c95991c1 Merge remote-tracking branch 'origin/master' into stackdriver-plugin 2018-09-26 17:59:56 +02:00
Peter Holmberg
3590ca2632 Added constant 2018-09-26 15:18:46 +02:00
Peter Holmberg
70c3e1f3bc tests 2018-09-26 15:12:06 +02:00
Peter Holmberg
64eace96c0 first test 2018-09-25 16:50:13 +02:00
Peter Holmberg
0b7576a1f9 filter plugins and layout mode 2018-09-25 16:21:52 +02:00
Peter Holmberg
e8cc0f3fff render list 2018-09-25 14:53:55 +02:00
Peter Holmberg
bb20e5cb94 created test for graph disclaimer 2018-09-25 11:50:55 +02:00
Peter Holmberg
ecf08b060c limit number of time series show in explore graph 2018-09-24 16:35:24 +02:00
Patrick O'Carroll
daffa7d067 removed border, cleaned up css and fixed class naming 2018-09-24 12:49:29 +02:00
David Kaltschmidt
d07a3a7637 Explore: moved code to app/features/explore 2018-09-24 12:16:06 +02:00
Torkel Ödegaard
94ee39291f added beta notice 2018-09-21 11:28:19 +02:00
Patrick O'Carroll
c1d36f9e48 created switch button for org users that can toggle between users and invites 2018-09-21 10:25:46 +02:00
Torkel Ödegaard
c282f39121 Merge branch 'master' into stackdriver-plugin 2018-09-21 10:17:13 +02:00
Torkel Ödegaard
5b52225450 wip: panel options idea2 2018-09-20 09:01:06 +02:00
Torkel Ödegaard
3c7e54461f updated 2018-09-18 15:32:06 +02:00
Torkel Ödegaard
be3b684140 Merge branch 'master' into react-panels 2018-09-18 15:19:43 +02:00
Torkel Ödegaard
c2686781b9 Merge branch 'text_variable-3173' of https://github.com/daldoyle/grafana 2018-09-17 13:21:11 +02:00
Marcus Efraimsson
b2833daf32
Merge pull request #13285 from marefr/team_member_ext 
Team member labels
 2018-09-17 09:14:06 +02:00
Torkel Ödegaard
dd0b1d8410 Merge branch 'remove-mobx' 2018-09-15 15:04:03 +02:00
Torkel Ödegaard
693f2fd8e9
Merge pull request #13273 from grafana/permissions-to-redux 
Permissions to redux
 2018-09-15 15:02:13 +02:00
Torkel Ödegaard
3f309ff5dd rename folder 2018-09-15 04:50:22 -07:00
Marcus Efraimsson
da68b858d7
display team member labels 2018-09-14 17:28:34 +02:00
David Kaltschmidt
1a38c45dde Hotfix for Explore (empty page after running query) 
Since #13212 adhoc filters are being gathered, in Explore the template
  service has no variables set and then throws when iterating over them.
 2018-09-14 16:09:43 +02:00
Torkel Ödegaard
e58c2ebc1c tech: remove all mobx stuff 2018-09-14 09:43:34 +02:00
Daniel Lee
65cbcc06eb upload: make the button text configurable 2018-09-14 09:39:16 +02:00
Erik Sundell
b71e7f33c3 Improved user experience 2018-09-14 09:35:26 +02:00
Erik Sundell
4fa4c27537 Upload: Fixing link function in directive 2018-09-14 09:35:26 +02:00
Erik Sundell
834d06c35b Build new stackdriver frontend script 2018-09-14 09:33:50 +02:00
Torkel Ödegaard
331be7d47a fix: add permission fixes 2018-09-14 08:25:35 +02:00
Torkel Ödegaard
776d81189f test: added simple dashboard reducer test 2018-09-14 07:52:17 +02:00
Torkel Ödegaard
7bb0109261 feat: dashboard permissions are working 2018-09-14 07:47:33 +02:00
Torkel Ödegaard
c7fdea1dfb wip: dashboard permissions to redux 2018-09-13 16:00:02 +02:00
Torkel Ödegaard
d173ebe7e8 Merge branch 'master' into permissions-to-redux 2018-09-13 14:48:04 +02:00
Torkel Ödegaard
e1a1da9064 fix: add folder permission fix 2018-09-13 14:31:12 +02:00
Torkel Ödegaard
f2edb82e79
Folder pages to redux (#13235) 
* creating types, actions, reducer

* load teams and store in redux

* delete team

* set search query action and tests

* Teampages page

* team members, bug in fetching team

* flattened team state, tests for TeamMembers

* test for team member selector

* wip: began folder to redux migration

* team settings

* actions for group sync

* wip: progress on redux folder store

* wip: folder to redux

* wip: folder settings page to redux progress

* mobx -> redux: major progress on folder migration

* redux: moved folders to it's own features folder

* fix: added loading nav states

* fix: gofmt issues

* wip: working on reducer test

* fix: added reducer test
 2018-09-13 14:10:51 +02:00
Torkel Ödegaard
d35eca333f folder permissions in redux 2018-09-13 13:56:09 +02:00
Torkel Ödegaard
f360b6186b wip: first couple of things starting to work 2018-09-13 10:52:29 +02:00
Torkel Ödegaard
8096cd8f33 fix: added reducer test 2018-09-13 07:30:27 +02:00
David
a5bcd4b8e4 Adhoc-filtering for prometheus dashboards (#13212) 
* Basic adhoc-filtering support for prometheus
 2018-09-12 18:10:57 +02:00
Dan Doyle
f0e905f3c9 First pass at a text based template var, getting feedback from devs 2018-09-12 13:17:15 +00:00
Torkel Ödegaard
a317158b72 wip: working on reducer test 2018-09-12 12:18:24 +02:00
Torkel Ödegaard
0705bf570d fix: added loading nav states 2018-09-12 09:47:23 +02:00
Torkel Ödegaard
a83beac565 redux: moved folders to it's own features folder 2018-09-12 09:15:18 +02:00
Torkel Ödegaard
7c27a87dcb Merge branch 'master' into folder-to-redux 2018-09-12 08:28:37 +02:00
Torkel Ödegaard
f5ee91f85a
fix: added type export to fix failing test 2018-09-11 19:30:38 +02:00
Torkel Ödegaard
98daceade0 fix: fixed typescript test error 2018-09-11 19:08:32 +02:00
Torkel Ödegaard
ec41d76080 mobx -> redux: major progress on folder migration 2018-09-11 19:00:37 +02:00
Torkel Ödegaard
19cbff658b wip: folder settings page to redux progress 2018-09-11 17:36:23 +02:00
Torkel Ödegaard
89ea47e7fb Merge branch 'master' into folder-to-redux 2018-09-11 15:07:03 +02:00
Peter Holmberg
9f73f13091 Teams page replace mobx (#13219) 
* creating types, actions, reducer

* load teams and store in redux

* delete team

* set search query action and tests

* Teampages page

* team members, bug in fetching team

* flattened team state, tests for TeamMembers

* test for team member selector

* team settings

* actions for group sync

* tests for team groups

* removed comment

* remove old stores

* fix: formating of datasource.go

* fix: minor changes to imports

* adding debounce and fixing issue in teamlist

* refactoring: moving types to their own files
 2018-09-11 14:14:03 +02:00
Torkel Ödegaard
1ce9001141
upgrade of typescript and tslint and jest (#13223) 2018-09-11 13:48:13 +02:00
Torkel Ödegaard
61112d93d8 wip: folder to redux 2018-09-11 10:36:55 +02:00
Torkel Ödegaard
679ffbfd83 wip: progress on redux folder store 2018-09-10 21:49:04 +02:00
Torkel Ödegaard
9caa030108 Merge remote-tracking branch 'origin/teams-page-replace-mobx' into folder-to-redux 2018-09-10 21:14:33 +02:00
Torkel Ödegaard
108a20196f Merge branch 'master' into teams-page-replace-mobx 2018-09-10 19:31:19 +02:00
Torkel Ödegaard
3ceab9484d wip: moving option tabs into viz tab 2018-09-10 19:04:56 +02:00
Torkel Ödegaard
c82bf7f67f fix: changing edit / view fullscreen modes now work 2018-09-10 17:55:06 +02:00
Peter Holmberg
0cfcf2685e actions for group sync 2018-09-10 16:58:17 +02:00
Torkel Ödegaard
df822a660b initial render/refresh timing issues 2018-09-10 16:19:28 +02:00
Peter Holmberg
b1fe0c4c7e team settings 2018-09-10 15:53:58 +02:00
Torkel Ödegaard
100ab0ba23 Merge branch 'master' into react-panels 2018-09-10 15:42:36 +02:00
Torkel Ödegaard
59b5b146da wip: began folder to redux migration 2018-09-10 14:30:42 +02:00
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
Torkel Ödegaard
864c4691da fix: minor fix to changing type 2018-08-25 12:38:25 -07:00
Torkel Ödegaard
fd81f89509 wip: angular panels now have similar edit mode and panel type selection enabling quick changing between panel react and angular panel types 2018-08-25 12:22:50 -07:00
Torkel Ödegaard
6ba8f6c5ab wip: major change for refresh and render events flow 2018-08-25 08:49:39 -07:00
Torkel Ödegaard
91b343403c wip: minor fixes 2018-08-25 07:21:00 -07:00
Marcus Efraimsson
6995242b8b
copy and docs update for alert notification reminders 2018-08-24 19:13:52 +02:00
Torkel Ödegaard
1c97816275 wip: trying to align react & angular edit modes 2018-08-24 18:46:17 +02:00
Torkel Ödegaard
0b794ff685 Merge branch 'master' into react-panels 2018-08-24 17:29:10 +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
Torkel Ödegaard
4e089229fb minor fix for legacy panels 2018-07-16 14:56:40 +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
211e0f2199 wip: another baby step, another million to go 2018-07-11 12:11:21 -07:00
Torkel Ödegaard
902eba90d0 Merge branch 'master' into react-panels 2018-07-11 11:39:22 -07: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
Torkel Ödegaard
dc3a81200b wip: you can now change panel type in edit mode 2018-07-09 13:24:15 -07:00
Torkel Ödegaard
761283231c react panels: working on changing type 2018-07-09 18:17:51 +02:00
Torkel Ödegaard
e052e165e9 Merge branch 'react-panels' of github.com:grafana/grafana into react-panels 2018-07-09 15:35:31 +02:00
Torkel Ödegaard
4fd2107071 Merge branch 'master' of github.com:grafana/grafana into react-panels 2018-07-09 15:35:16 +02:00
Torkel Ödegaard
8036c49ffe wip: minopr progress on react panel edit infra 2018-07-08 12:29:23 -07:00
Torkel Ödegaard
50f24c98f7 wip: minor progres on react panels edit mode 2018-07-08 07:39:25 -07:00
Torkel Ödegaard
dbe191fd55 wip: viz editor started 2018-07-07 05:10:42 -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
Torkel Ödegaard
dec62d7340 another baby step 2018-07-06 04:42:59 -07:00