IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-16 18:34:52 -06:00
Code Issues Packages Projects Releases Wiki Activity
22,495 Commits 5,454 Branches 554 Tags 1.9 GiB
e5e7bd3153
Commit Graph

4597 Commits

Author SHA1 Message Date
Hugo Häggmark
53322a51e2 fix: refactored so members are loaded by TeamPages and use hideFromTabs instead of filtering out children in navModel 2019-03-19 14:01:22 +01:00
Hugo Häggmark
e23e6a8bdc fix: fixed snapshots and permission select not beeing able to click 2019-03-19 14:01:21 +01:00
Hugo Häggmark
b71c9803a9 fix: new team link goes nowhere for viewers 2019-03-19 14:01:21 +01:00
Hugo Häggmark
53c74fa2f5 teams: refactor so that you can only delete teams if you are team admin 2019-03-19 14:01:21 +01:00
Hugo Häggmark
13ed10495a teams: hide tabs settings and groupsync for non team admins 2019-03-19 14:01:18 +01:00
Hugo Häggmark
8c34f595f0 teams: disable new team button if user is viewer 2019-03-19 14:01:18 +01:00
Hugo Häggmark
e3fc61b326 refactor: moved test from TeamMembers to TeamMemberRow 2019-03-19 14:01:17 +01:00
Hugo Häggmark
178d637b4e refactor: splitted TeamMembers to TeamMemberRow 2019-03-19 14:01:17 +01:00
Hugo Häggmark
b82b94a247 teams: disable buttons for team members 2019-03-19 14:01:15 +01:00
Hugo Häggmark
b60e71c28b teams: moved logic for searchteams to backend 2019-03-19 14:01:15 +01:00
Leonard Gram
8593668ab2 teams: tests use the new message for modifying team members. 2019-03-19 14:01:12 +01:00
Hugo Häggmark
96aa4ae19f teams: remov permission select for non admin users 2019-03-19 14:01:12 +01:00
Hugo Häggmark
a90b3e331e config: updated feature toggle name 2019-03-19 13:59:39 +01:00
Leonard Gram
89d4db8eb6 teams: team listing shows only your teams (editors). 2019-03-19 13:57:29 +01:00
Hugo Häggmark
3c46b786d2 teams: change back to permissionlevel for Member to 0 2019-03-19 13:57:26 +01:00
Hugo Häggmark
1315a67022 teams: make sure we use TeamPermissionLevel enum 2019-03-19 13:57:25 +01:00
Hugo Häggmark
eea2dcc605 teams: enabled so that user can update permission for team members 2019-03-19 13:57:24 +01:00
Hugo Häggmark
467b7a40d8 teams: feature toggle component 2019-03-19 13:57:24 +01:00
Hugo Häggmark
7888457aae teams: basic ui for permission in team members view 2019-03-19 13:57:23 +01:00
Torkel Ödegaard
25cd196c09
Merge pull request #16006 from grafana/fix-explore-refId 
Explore: Query row using character refId instead of number
 2019-03-18 22:59:47 +01:00
Torkel Ödegaard
32d80f2da8
Merge pull request #16045 from grafana/hugoh/no-implicit-any 
Cleaning up implicit anys in DashboardExporter and tests
 2019-03-18 22:50:23 +01:00
Torkel Ödegaard
89bf94b07c
Merge pull request #16054 from grafana/input-to-grafanaui2 
Input to grafanaui2
 2019-03-18 22:49:40 +01:00
Torkel Ödegaard
5617db36b2
Merge pull request #16014 from alexanderzobnin/fix-15993 
Panels: fix loading panels with non-array targets
 2019-03-18 22:34:24 +01:00
Peter Holmberg
384e11fd68 Copied from new timepicker and unified component branch 2019-03-18 15:41:46 +01:00
Peter Holmberg
39728c885b rename to char 2019-03-18 11:17:58 +01:00
Peter Holmberg
515fb5903e sorting imports 2019-03-18 10:44:00 +01:00
Hugo Häggmark
0eb2ca3ffd chore: Cleaning up implicit anys in DashboardExporter and tests 
progress: #14714
 2019-03-18 07:42:43 +01:00
ryan
c210417736 Merge remote-tracking branch 'grafana/master' into all-data-as-table 
* grafana/master:
  Explore: Fix log stats for long labels
  dont test exists in the test... it will fail if not found
  add random_walk_table scenario
  add test file
  add startAt to random walk scenario
 2019-03-17 18:10:35 -07:00
Steven Sheehy
ec34099ea7
Explore: Fix log stats for long labels 
Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
 2019-03-16 00:55:10 -05:00
ryan
a6132d7648 merge singlestat refactor 2019-03-15 15:37:56 -07:00
ryan
ff3c25ad79 Merge remote-tracking branch 'grafana/master' into all-data-as-table 
* grafana/master: (57 commits)
  feature(explore/table): Add tooltips to explore table (#16007)
  Update changelog
  Add check for Env before log
  Update index.md
  chore: Cleaning up implicit anys in manage_dashboard.ts and manage_dashboard.test.ts progress: #14714
  chore: Cleaning up implicit anys in app.ts progress: #14714
  changelog: adds note about closing #15836
  changelog: adds note about closing #6359 and #15931
  add partial
  Add check so that header is not sent for anonymous users
  Update config docs
  Add custom header with grafana user and a config switch for it
  changelog: adds note about closing #10816
  use constants for cache type
  makes variables template prettier complient
  white space formating
  changelog: adds note about #15744
  updates old distcache names
  dont allow inifinite expiration
  return error if cache type is invalid
  ...
 2019-03-15 09:19:01 -07:00
ryan
77b78e36e5 Merge remote-tracking branch 'grafana/master' into reusable-formatting-options 
* grafana/master: (44 commits)
  feature(explore/table): Add tooltips to explore table (#16007)
  Update changelog
  Add check for Env before log
  Update index.md
  chore: Cleaning up implicit anys in manage_dashboard.ts and manage_dashboard.test.ts progress: #14714
  chore: Cleaning up implicit anys in app.ts progress: #14714
  changelog: adds note about closing #15836
  changelog: adds note about closing #6359 and #15931
  add partial
  Add check so that header is not sent for anonymous users
  Update config docs
  Add custom header with grafana user and a config switch for it
  changelog: adds note about closing #10816
  use constants for cache type
  updates old distcache names
  dont allow inifinite expiration
  return error if cache type is invalid
  use `Get` instead of `Find`
  avoid exposing cache client directly
  add docs about remote cache settings
  ...
 2019-03-15 08:23:55 -07:00
Steven Sheehy
fff6e0a522 feature(explore/table): Add tooltips to explore table (#16007) 
Longer labels are now viewable as a tooltip in the Explore table

Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
 2019-03-15 14:11:40 +01:00
Alexander Zobnin
c028d410ec
panels: fix loading panels with non-array targets (add tests) 2019-03-15 11:30:41 +03:00
Alexander Zobnin
fe798239b2
panels: fix loading panels with non-array targets (refactor) 2019-03-15 10:31:58 +03:00
Alexander Zobnin
e3b3b35dca
panels: fix loading panels with non-array targets 2019-03-15 10:14:56 +03:00
ryan
985f057ab3 revert most options sharing 2019-03-14 13:20:24 -07:00
Sean Lafferty
3f9a19dcd5 Merge branch 'master' into 12556-oauth-pass-thru 2019-03-14 13:18:00 -04:00
Peter Holmberg
52dcb9bf00 renaming function 2019-03-14 17:39:56 +01:00
Peter Holmberg
cf55d68894 using refId from panel model 2019-03-14 17:20:33 +01:00
Torkel Ödegaard
12219a1d7e
Merge pull request #15957 from ryantxu/panel-options-init 
improve the new PreservePanelOptionsHandler
 2019-03-14 13:05:09 +01:00
ryan
734a209535 Merge remote-tracking branch 'grafana/master' into all-data-as-table 
* grafana/master:
  generic repeater
  generic repeater
  explore/logs: Hide empty duplicates column
  fix for firefox checkboxes not appearing properly, added appearance as none
  used regex instead of string replacing
 2019-03-13 13:28:49 -07:00
ryan
68f7e046ab check types better 2019-03-13 13:11:49 -07:00
ryan
0c086795e3 check types better 2019-03-13 13:07:01 -07:00
ryan
75022ebd63 single hook 2019-03-13 12:46:04 -07:00
Torkel Ödegaard
9c4abc9d0c
Merge pull request #15982 from steven-sheehy/hide-duplicate-column 
explore/logs: Hide empty duplicates column
 2019-03-13 20:38:18 +01:00
Torkel Ödegaard
bfc84c0f2b
Merge pull request #15980 from srid12/custom-variable-issue-15921 
used regex instead of string replacing
 2019-03-13 20:34:56 +01:00
Sean Lafferty
8d19ca005f Merge branch 'master' into 12556-oauth-pass-thru 2019-03-13 14:25:43 -04:00
Sean Lafferty
f79dc0a89b Remove auth_module settings from oauthPassThru ui 2019-03-13 13:34:10 -04:00
corpglory-dev
a550e5388a Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-03-13 19:31:40 +03:00
Steven Sheehy
17184257af
explore/logs: Hide empty duplicates column 
Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
 2019-03-13 11:12:29 -05:00
ryan
b4a3aecbbc merge master 2019-03-13 09:03:32 -07:00
ryan
b933c57c62 merge master 2019-03-13 08:36:51 -07:00
sridhar-komati
03d4b61208 used regex instead of string replacing 2019-03-13 20:42:19 +05:30
Torkel Ödegaard
4bbd6ab79c
Merge pull request #15975 from grafana/fixed-alert-link-issue 
Fixed issue with AlertList panel links resulting in panel not found errors
 2019-03-13 15:52:14 +01:00
Torkel Ödegaard
91fc73bf82 Fixed issue with alert links in alert list panel causing panel not found errors, fixes #15680 2019-03-13 13:51:22 +01:00
Torkel Ödegaard
d6bab53d3b
Merge pull request #15626 from grafana/davkal/15607-explore-line-colors 
Explore: Make sure line graphs get different colors
 2019-03-13 12:21:44 +01:00
Torkel Ödegaard
2333cf3fd1 Improved error handling when rendering dashboard panels, fixes #15913 2019-03-13 11:43:16 +01:00
Torkel Ödegaard
9e7d1f4275
Merge pull request #15466 from grafana/bar-gauge-poc 
New Bar Gauge panel
 2019-03-13 11:12:33 +01:00
ijin08
c96b3995e4 moved delete button from sidebar to general tab and renamed it 2019-03-13 10:24:26 +01:00
Torkel Ödegaard
aa6a9329c3
Merge pull request #15842 from ryantxu/alpha-react-virtualized-table 
Alpha react-virtualized table
 2019-03-13 08:42:51 +01:00
Torkel Ödegaard
71159fb606 Merge remote-tracking branch 'origin/master' into bar-gauge-poc 2019-03-13 08:26:06 +01:00
ryan
8cca611727 comment cleanup 2019-03-12 21:25:35 -07:00
ryan
09ba8cd5d3 make sure the validator is called before setState 2019-03-12 16:35:22 -07:00
ryan
7311b14da1 API to fix/update properties before load 2019-03-12 16:10:14 -07:00
Torkel Ödegaard
ab2caf9ef9
Merge pull request #15943 from grafana/15429-removed-sass-var-in-js 
Removed SASS variables being used in JS
 2019-03-12 17:18:12 +01:00
ryan
90510b5ffb Merge remote-tracking branch 'grafana/master' into alpha-react-virtualized-table 
* grafana/master:
  Fixed type issues introduced by adding angular types
  Typescript noAny fixes, start of a long journey
  Updated code stats collection
  Updated path to new script
  POC on collecting metrics in ci process
  renamed default variables: s -> sm, m -> md, l -> lg
  removed gf-form-margin variable and replaced with space- variables where it was used
  heatmap: able to hide buckets with zero value #12080
  s -> sm, m -> md, l -> lg
  heatmap: fix prometheus buckets sorting, closes #15637
  s -> sm, m -> md, l -> lg
  removed headings-margin-bottom variable
  remove kbn test
  Added scopedVars argument in datasourceSrv.get in DataPanel
  Refactoring of multi-value datasource PR #15812
  fixed minor misstake with dashboard padding
  removed -margin, replaced with new general variables
  added new space variables to margins in AddPanelWidget, add_data_source, dashboard_settings and sidemenu
  added new variables for spacing, set margins in _cards with new variables
  Make datasource variables multiselect and dashboard repeatable
 2019-03-12 09:04:20 -07:00
Torkel Ödegaard
d7dc6ad3f4 Fixed type issues introduced by adding angular types 2019-03-12 15:27:02 +01:00
ijin08
dc98fb5e82 added two new variables in default theme for panel padding, replaced panelhorizontalpadding and variables.panelverticalpadding with new variables 2019-03-12 14:24:48 +01:00
Torkel Ödegaard
51c06a8c46
Merge pull request #15901 from grafana/8px-system-margins 
8px system margins
 2019-03-12 12:31:31 +01:00
Torkel Ödegaard
6f34b1541d
Merge pull request #15914 from grafana/multi-valued-datasource-variable 
Multi valued datasource variable
 2019-03-12 09:48:02 +01:00
ijin08
a418697453 s -> sm, m -> md, l -> lg 2019-03-12 08:10:31 +01:00
ryan
152aa76648 merge master 2019-03-11 21:16:51 -07:00
Torkel Ödegaard
aeb3553491 Added scopedVars argument in datasourceSrv.get in DataPanel 2019-03-11 18:36:49 +01:00
ryan
f4ae0cfaa8 Merge remote-tracking branch 'grafana/master' into all-data-as-table 
* grafana/master:
  fix(explore/logs) not collapsing whitespace (#15737)
  Refactoring / fixing password hint PR #15868
  chore: Move sidemenu out of context service and use the logic we have in the router already for hiding the sidemenu
  Fix deduplication results displaying wrong data (#15755)
  Revert "Fix Datasource Update to no User/Password"
  fix imageurl in notification test
  changed all rems to pixels in defaults and template, changed back root font size
  Make password hint configurable from settings/defaults.ini
  changed root font to 100%(default 16px), changed font-size from px to rem, updated rem sizes in template and default.ts files, removed display classes and variables since not used, removed lead class and variables since not usedremoved serif font since not used and probably never should be used
  fix: Update test snapshot
  fix: Logo goes Home instead of toggling side menu #15482
  Fix: #14706 Incorrect index pattern padding in alerting queries
  Removed commented code
  Fixed alias in Cloudwatch Expressions
 2019-03-11 09:06:08 -07:00
Steven Sheehy
aa7e348694 fix(explore/logs) not collapsing whitespace (#15737) 
- Set container width to 100% so column widths can be calculated properly
- Sets duplicates, level, timestamp, local time to a fixed width based upon em units since the size of these are static
- Sets labels to be 20%
- Remove min-width:80% on message column so that it now consumes remaining space
- Additionally fixes long labels from overflowing into the messages column by properly setting a max-width per label and hiding overflow

closes #15673

Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
 2019-03-11 15:55:11 +01:00
Torkel Ödegaard
bf72b26c2c Refactoring of multi-value datasource PR #15812 2019-03-11 15:44:11 +01:00
Torkel Ödegaard
a8486806aa Merge branch 'multiselect-repeatby-datasource' of https://github.com/jdoupe/grafana into jdoupe-multiselect-repeatby-datasource 2019-03-11 14:14:26 +01:00
Dominik Prokop
a853e2c36e
Fix deduplication results displaying wrong data (#15755) 
The log rows were mutated in the store, what resulted in wrong deduplication results as well as made the selector memoization quirky - for "the same results" the selector was running twice.
 2019-03-11 11:48:14 +01:00
ijin08
d55f189749 added new space variables to margins in AddPanelWidget, add_data_source, dashboard_settings and sidemenu 2019-03-11 11:33:15 +01:00
ryan
eef94b3f08 Merge remote-tracking branch 'grafana/master' into all-data-as-table 
* grafana/master:
  reuse deprecationWarning
  move to string.ts
  move stringToJsRegex
  minor storybook cleanup
  docs: update slack alert notification settings
 2019-03-10 15:34:18 -07:00
ryan
0a094c1226 merge master 2019-03-10 13:45:18 -07:00
ryan
b2a7891b08 move stringToJsRegex 2019-03-09 23:50:46 -08:00
ryan
343e49decb Merge remote-tracking branch 'grafana/master' into alpha-react-virtualized-table 
* grafana/master: (24 commits)
  docs: Fix indentation level for OAuth2 config
  docs: update CONTRIBUTING.md
  @grafana/ui - release docs v1 (#15835)
  Minor refactoring of copy tags when saving feature, #15446
  Simple implementation for preserve tags, closes #11627
  Updated prettierignore
  Refactoring of PR #14772
  fix typo in pr template
  add nil/length check when delete old login attempts
  Minor refactoring of new react text panel
  fix allow anonymous server bind for ldap search
  use pure component
  use replaceVariables
  Catch bad regex exception at controller level
  11780: invalid reg value can cause unexpected behaviour
  update
  Add string quote func
  Remove option used to control within browser
  Add pic into actionCard message
  Add new option to set where to open the message url
  ...
 2019-03-08 20:52:30 -08:00
ryan
6617a382a3 Merge remote-tracking branch 'grafana/master' into all-data-as-table 
* grafana/master: (23 commits)
  @grafana/ui - release docs v1 (#15835)
  Minor refactoring of copy tags when saving feature, #15446
  Simple implementation for preserve tags, closes #11627
  Updated prettierignore
  Refactoring of PR #14772
  fix typo in pr template
  add nil/length check when delete old login attempts
  Minor refactoring of new react text panel
  fix allow anonymous server bind for ldap search
  Update README.md
  use pure component
  use replaceVariables
  Catch bad regex exception at controller level
  11780: invalid reg value can cause unexpected behaviour
  update
  Add string quote func
  Remove option used to control within browser
  Add pic into actionCard message
  Add new option to set where to open the message url
  Optimize the Dingding match values format
  ...
 2019-03-08 08:25:30 -08:00
Torkel Ödegaard
04c88a226b Minor refactoring of copy tags when saving feature, #15446 2019-03-08 14:24:45 +01:00
Torkel Ödegaard
60272d8a77 Simple implementation for preserve tags, closes #11627 2019-03-08 14:00:44 +01:00
corpglory-dev
7bc741c4e2 piechart -> pieChart 2019-03-08 13:51:25 +03:00
ryan
2db4004d62 Merge remote-tracking branch 'grafana/master' into alpha-react-virtualized-table 
* grafana/master:
  Update README.md
  Update core:start cli command to watch theme changes again (#15856)
  Updated pull request template
  Updated pull request rtemplate
  Removed title case from issue template title
  Updated issue template titles
  Updated issue templates
  Updated templates
  fix: Update error message and replace npm with yarn #15851
  fix: Make sure we dont add &autofitpanels to the url if it already exists #15849
  Update upgrading.md for wrong spell
  return the same panelData unless it changes
  Map dataSourceTypeSearchQuery state from redux to search input.
  Revert "Fix for leaving playlist mode"
  add new issue templates
 2019-03-07 14:20:42 -08:00
ryan
439b044204 move toTableData to grafana/ui 2019-03-07 13:09:53 -08:00
ryan
8bf57359ab don't require x & y columns for timeSeries 2019-03-07 12:47:21 -08:00
ryan
abf015ace2 use TableData for timeseries in react 2019-03-07 12:13:38 -08:00
Torkel Ödegaard
a826c117e2
Merge pull request #15834 from grafana/revert-15791-fix/leave-playlist 
Revert "Fix for leaving playlist mode"
 2019-03-07 08:46:14 +01:00
Torkel Ödegaard
12263a3f70
Merge pull request #15838 from aocenas/fix-new-datasource-search 
Fix new datasource search input
 2019-03-07 08:45:52 +01:00
ryan
6a8a60bcdf Merge remote-tracking branch 'grafana/master' into alpha-react-virtualized-table 
* grafana/master:
  Minor refactoring of PR #15770
  Alternative fix to detecting when to stop a playlist, fixes #15701 and #15702
  fix discord notifier so it doesn't crash when there are no image generated
  Add a keybinding that toggles all legends in a dashboard
  removed color in color variables names
  changed some more color variables to use variables
 2019-03-06 16:03:48 -08:00
ryan
82326fed42 return the same panelData unless it changes 2019-03-06 15:18:24 -08:00
Andrej Ocenas
a59e0f1b55 Map dataSourceTypeSearchQuery state from redux to search input. 2019-03-06 22:30:40 +01:00
Torkel Ödegaard
1ab548f423
Merge pull request #15832 from grafana/stop-playlist 
Alternative fix to detecting when to stop a playlist
 2019-03-06 17:57:37 +01:00
Torkel Ödegaard
2604e9e433 Minor refactoring of PR #15770 2019-03-06 17:53:14 +01:00
Torkel Ödegaard
18d5c04ae4 Merge branch 'toggle-all-legends' of https://github.com/jsferrei/grafana into jsferrei-toggle-all-legends 2019-03-06 17:48:59 +01:00
Torkel Ödegaard
3895294f97
Revert "Fix for leaving playlist mode" 2019-03-06 17:39:18 +01:00
Torkel Ödegaard
3375c72d56 Alternative fix to detecting when to stop a playlist, fixes #15701 and #15702 2019-03-06 17:30:57 +01:00
ryan
26e3e7146e Merge remote-tracking branch 'grafana/master' into alpha-react-table 
* grafana/master: (24 commits)
  fix: Consistency in unit labels #15709
  Update latest.json
  Update CHANGELOG.md
  position from add panel, dimensions from copied panel
  changelog: add notes about closing #14509 #15179
  fix: Add class for input fields with help icon to avoid icon hiding the text #15771
  Update CHANGELOG.md
  restore to current folder when restoring old dashboard version
  fix(renderer): Vendor ansicolor as typescript
  log phantomjs output even if it timeout and include orgId when render alert
  keep size from copied panel and not from add panel widget
  Added basic cherry pick helping task
  Prevent search in VizPicker from stealing focus (#15802)
  fix only users that can edit a dashboard should be able to update panel json
  Updated changelog task
  Fixed image rendering issue for dashboards with auto refresh, casued by missing reloadOnSearch flag on route, fixes #15631
  Updated to add PR author, skip PR issue references
  Added first iteration/poc of changelog task
  Enable @grafana/ui version bump based on package.json contents
  Ensure clean master only when publishing package to npm
  ...
 2019-03-06 08:21:36 -08:00
Torkel Ödegaard
878b41d666
Merge pull request #15822 from grafana/copy-panel-retain-size 
Keep size from copied panel
 2019-03-06 17:06:19 +01:00
Torkel Ödegaard
8e51667371
Merge pull request #15828 from grafana/15771-datasource-url-icon 
Add padding to all input fields with help icon
 2019-03-06 15:37:02 +01:00
Peter Holmberg
2c1be2c37e position from add panel, dimensions from copied panel 2019-03-06 15:19:58 +01:00
Torkel Ödegaard
73980adb17
Merge pull request #15826 from grafana/davkal/15635-vendor-ansicolor-ts 
fix(renderer): Vendor ansicolor as typescript
 2019-03-06 15:06:46 +01:00
Johannes Schill
e7297fef06 fix: Add class for input fields with help icon to avoid icon hiding the text #15771 2019-03-06 14:45:13 +01:00
David Kaltschmidt
26236b4bc3 fix(renderer): Vendor ansicolor as typescript 
Fixes #15635

Importing ansicolor from node_modules or vendored as is failed because
there is no ES5 transpiler configured for ES6 libs.

- remove ansicolor from package.json
- add ansicolor to public/vendor/ansicolor and port to typescript
- adapt all ansicolor imports
- add `public/vendor` as a path to be considered by ts compiler
 2019-03-06 14:22:59 +01:00
Marcus Efraimsson
1323043bd4
Merge pull request #15805 from grafana/15667_fix 
fix only users that can edit a dashboard should be able to update panel json
 2019-03-06 13:56:49 +01:00
Peter Holmberg
db2b8ea602 keep size from copied panel and not from add panel widget 2019-03-06 13:23:11 +01:00
Peter Holmberg
4e57ead38d Prevent search in VizPicker from stealing focus (#15802) 
Fixes #15569 focus issue in viz picker search
* added state to not set focus on search every render
* move to new component to handle focus
 2019-03-06 13:07:08 +01:00
Marcus Efraimsson
1a588dadbe
fix only users that can edit a dashboard should be able to update panel json 2019-03-06 12:57:19 +01:00
ryan
ea5db92996 Merge remote-tracking branch 'grafana/master' into alpha-react-table 
* grafana/master:
  Fixed styling of gicon's in dropdown menus
  cleanup plugin versions
  use explore icon
  fix comments
  typescript functions on replace
  remove console.log
  add ScopedVars to replace function
  Expose onQueryChange to angular plugins
  fix allow anonymous initial bind for ldap search
 2019-03-06 00:59:27 -08:00
Torkel Ödegaard
2039278a93
Merge pull request #15807 from jsferrei/angular-plugin-onquerychange 
Expose onQueryChange to angular plugins
 2019-03-06 09:28:56 +01:00
Torkel Ödegaard
3aad4e212f
Merge pull request #15816 from ryantxu/plugin-page-cleanup 
cleanup plugin versions
 2019-03-06 09:11:57 +01:00
Torkel Ödegaard
5efa737217
Merge pull request #15814 from ryantxu/replace-scoped-vars 
add ScopedVars to props.replaceVariables()
 2019-03-06 09:11:35 +01:00
ryan
909d425008 cleanup plugin versions 2019-03-05 23:40:03 -08:00
ryan
5524dacc9d use explore icon 2019-03-05 23:00:43 -08:00
ryan
3dd7d40718 fix comments 2019-03-05 22:18:42 -08:00
ryan
aa38a9e0b4 typescript functions on replace 2019-03-05 22:14:28 -08:00
ryan
948729e951 remove console.log 2019-03-05 22:00:12 -08:00
ryan
f5aba36814 add ScopedVars to replace function 2019-03-05 21:56:52 -08:00
Jeremy Doupe
3f27d3ea23 Make datasource variables multiselect and dashboard repeatable 
closes #7492 (and #7030)
 2019-03-05 22:47:22 -06:00
ryan
f59ccdf59c add a basic alpha react table 2019-03-05 16:07:46 -08:00
Jon Ferreira
a3da8dc673 Expose onQueryChange to angular plugins 2019-03-05 15:04:10 -05:00
Jon Ferreira
46fa09fdad Add a keybinding that toggles all legends in a dashboard 2019-03-05 13:19:40 -05:00
Torkel Ödegaard
281d9f6058
Merge pull request #15798 from grafana/fixed-scrollbar-not-visible 
Fixed scrollbar not visible initially (only after manual scroll)
 2019-03-05 17:34:30 +01:00
corpglory-dev
250ee2298a Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-03-05 17:13:38 +03:00
Torkel Ödegaard
6da87a17ef
Merge pull request #15793 from grafana/hugoh/bug-can-not-use-testdatasource-in-v6 
Update datasource in componentDidUpdate so that datasource is correct in state
 2019-03-05 15:06:44 +01:00
Torkel Ödegaard
cd78f0bef2 Fixed scrollbar not visible due to content being added a bit after mount, fixes #15711 2019-03-05 14:32:33 +01:00
Hugo Häggmark
09b036dc93 fix: update datasource in componentDidUpdate 
Closes #15751
 2019-03-05 13:08:31 +01:00
Hugo Häggmark
d3642a3e91
Moved Server Admin and children to separate menu item on Side Menu (#15592) 
* Moved Server Admin and children to separate menu item on Side Menu

* Removed style guide after PR comments
 2019-03-05 13:02:41 +01:00
Torkel Ödegaard
be8f60b0bf
Merge pull request #15791 from grafana/fix/leave-playlist 
Fix for leaving playlist mode
 2019-03-05 12:38:14 +01:00
Peter Holmberg
a158a19272 reordered import 2019-03-05 12:10:20 +01:00
Peter Holmberg
978cdfba00 Wrapperd playlist controls in clickoutsidewrapper 2019-03-05 12:08:57 +01:00
Torkel Ödegaard
a5455691b3 Hide time info switch when no time options are specified 2019-03-05 11:43:25 +01:00
Hugo Häggmark
48570c6272
Made sure that DataSourceOption displays value and fires onChange/onBlur events (#15757) 
* Fixed #15682 

* fix: Add hideTimeOverride to state since we need to control the Switch

* fix: Back the maxDataPoints change, we need to keep it as a string

Co-authored-by:johannes.schill@polyester.se
 2019-03-05 10:49:45 +01:00
Torkel Ödegaard
0016ad2cb3
Merge pull request #15774 from ryantxu/set-options 
Rename PanelEditorProps.onChange to onOptionsChange
 2019-03-05 09:11:56 +01:00
Torkel Ödegaard
57810ea5e5
Merge pull request #15775 from ryantxu/rename-interpolate 
use replaceVariables rather than onInterpolate
 2019-03-05 09:10:45 +01:00
Dominik Prokop
cee5f030dc
Fixed url of back button in datasource edit page, when root_url configured (#15759) 
* Fixed url of back button in datasource edit page, when root_url configured

* Update snapshots

* Use app config directly in ButtonRow instead of passing datasources page URL via prop

* Snapshots update
 2019-03-05 07:35:45 +01:00
ryan
3d16528459 use onOptionsChange 2019-03-04 12:35:24 -08:00
ryan
251008f590 use replaceVariables rather than onInterpolate 2019-03-04 11:44:38 -08:00
ryan
77d709d9df use updateOptions rather than onChange 2019-03-04 11:21:05 -08:00
Marcus Efraimsson
646ca90b10
Merge pull request #15767 from grafana/15650-autofitpanel-kiosktvmode 
No scroll in autofitpanel-mode
 2019-03-04 08:44:28 -08:00
Johannes Schill
cc40a515be fix: When in tv-mode, autofitpanel should not take space from the navbar #15650 2019-03-04 13:46:10 +01:00
Hugo Häggmark
3a65e27e83 Fixes #15739 2019-03-04 10:42:59 +01:00
Torkel Ödegaard
84b2c0447e Fixed right side scrollbar margin on dashboard page 2019-02-28 08:29:18 -08:00
corpglory-dev
e842e86e2a Merge branch 'master' into piechart-react 2019-02-27 16:09:13 +03:00
David Kaltschmidt
e6a74eb1a2 Explore: Make sure line graphs get different colors 
- lines for graphs from different query rows end up in different
transactions
- within each transaction the color distribution resets leading to color
overlap
- this change takes existing transaction colors into account
 2019-02-24 10:01:50 -08:00
Torkel Ödegaard
f768808b6e Fixed value dropdown not updating when it's current value updates, fixes #15566 2019-02-23 08:59:00 +01:00
Valentin Agachi
425636ff70 Improve Loki logs render with ANSI colors (#15558) 
* Improve Loki logs render with ANSI colors

* fixup! Improve Loki logs render with ANSI colors

* fixup! Improve Loki logs render with ANSI colors

* fixup! Improve Loki logs render with ANSI colors
 2019-02-22 13:13:10 +01:00
Peter Holmberg
73b4d817e4 prettier fix 2019-02-21 16:07:07 +01:00
Peter Holmberg
362829d7ad Merge branch 'master' into bar-gauge-poc 2019-02-21 15:08:49 +01:00
Peter Holmberg
f3ff3c1aec fixed tests 2019-02-21 14:44:21 +01:00
Daniel Lee
bd0f55cbb8 panel: defensive coding that fixes #15563 
If a plugin incorrectly uses an attribute in the
query-editor-row directive, it should not throw
an exception.
 2019-02-21 14:42:31 +01:00
Peter Holmberg
89883c2cf6 copying options between visualizations 2019-02-21 13:43:36 +01:00
Torkel Ödegaard
b21eb36909 Merge branch 'master' of github.com:grafana/grafana 2019-02-21 12:18:34 +01:00
Torkel Ödegaard
31511ee3cc fixed snapshots failing in master 2019-02-21 12:10:01 +01:00
Dominik Prokop
0df56f9356 Merge branch 'master' into cli/watch-sass-var 2019-02-21 11:56:54 +01:00
Peter Holmberg
58f194b483 Merge branch 'master' into bar-gauge-poc 2019-02-21 10:38:26 +01:00
Dominik Prokop
9b03815141 Merge branch 'master' into cli/watch-sass-var 2019-02-21 09:50:24 +01:00
Torkel Ödegaard
7d105439f9 Fixed scrollbar issue introduced in theme changes 2019-02-21 09:41:53 +01:00
corpglory-dev
4edd22589c Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-02-20 14:54:26 +03:00
corpglory-dev
77f848b56d Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-02-19 21:27:22 +03:00
Daniel Lee
c5a70e9b97 Pass dashboardModel to PanelCtrl class. Fixes #15541 2019-02-19 18:53:07 +01:00
corpglory-dev
a053fb5908 Add piechart to builtInPlugins 2019-02-19 20:24:50 +03:00
Dominik Prokop
d19616a16b Merge branch 'master' into cli/watch-sass-var 2019-02-19 17:27:25 +01:00
Peter Holmberg
5f56a07a23 Merge branch 'master' into bar-gauge-poc 2019-02-19 15:43:08 +01:00
Dominik Prokop
88a46e6dd4 Bump Prettier version (#15532) 
* Fix prettier version to 1.16.4
 2019-02-19 15:41:35 +01:00
Johannes Schill
891b2ca1a2 fix: Have the tab param removed from the url when leaving edit mode #15485 2019-02-19 09:43:35 +01:00
Torkel Ödegaard
9d78960c5e
Merge pull request #15503 from grafana/explore-icon 
Updated explore icon and style tweaks
 2019-02-18 18:37:51 +01:00
Torkel Ödegaard
df170aee16 Updated explore icon and style tweaks 
Lowered icon size and improved paddings, tried to align placement between dashboard and explore
 2019-02-18 18:26:24 +01:00
Peter Holmberg
93e8edfddd Fixing array direction, adding simple render test, fixes #15478 
Fixed unit test and updated gauge
Added migration for threshold order
 2019-02-18 16:46:32 +01:00
Torkel Ödegaard
2afd3cf5aa
Merge pull request #15499 from grafana/hugoh/bug-thresholds-and-infinity 
Fixes #15477
 2019-02-18 15:07:24 +01:00
Hugo Häggmark
92972eed7b Fixes #15477 2019-02-18 13:56:48 +01:00
Torkel Ödegaard
35253cb7f7
Merge pull request #15498 from grafana/fix/15463 
Remove maxDataPoints and interval props from props to remember in panel model
 2019-02-18 12:37:07 +01:00
Torkel Ödegaard
26d02180e5 Merge branch 'bar-gauge-poc' of github.com:grafana/grafana into bar-gauge-poc 2019-02-18 12:01:15 +01:00
Torkel Ödegaard
711e4e926b Merge branch 'master' into bar-gauge-poc 2019-02-18 11:55:37 +01:00
Torkel Ödegaard
abddb442a1
Changed how react panels store their options (#15468) 
Changed how react panels store their options

* Added a ReactPanelPlugin as the interface that react panels export, this way react panels have clearer api, and gives us hooks to handle migrations and a way for panel to handle panel changes in the future
* Moved gauge value options into a sub oject and made editor more generic, will be moved out of gauge pane later and shared between singlestat, gauge, bargauge, honecomb
* Also remove nested options prop that was there due to bug
* Added missing Gauge props
* Fixed gauge issue that will require migration later and also value options editor did not handle null decimals or 0 decimals
* Fixed unit tests
* More fixes for react panels
 2019-02-18 11:41:14 +01:00
Torkel Ödegaard
a6cae5b2b8
Merge pull request #15494 from grafana/minor-tweaks-panel-edit 
Removed primary class from Add Query button, and changed name of panel options tab
 2019-02-18 11:36:19 +01:00
Dominik Prokop
8e035676e1 Remove maxDataPoints and interval props from props to remember in panel model 2019-02-18 11:33:16 +01:00
Dominik Prokop
75dd7d0036 Fix typo in view mode cykle button 2019-02-18 11:08:42 +01:00
Dominik Prokop
6da57d4c08 Make clear that variable scss files are generated from templates 2019-02-18 11:03:52 +01:00
Torkel Ödegaard
bf826d7c81 Removed primary class from Add Query button, and changed name of Panel Options tab o General Options 2019-02-18 10:49:14 +01:00
Torkel Ödegaard
89ad525986 Fixed issue with PanelHeader and grid-drag-handle class still being applied in fullscreen, fixes #15480 2019-02-17 08:11:57 +01:00
Torkel Ödegaard
dede40d459 Began work on handling panel type switching and keep setting 2019-02-17 07:03:42 +01:00
Torkel Ödegaard
1d4dae7aa8 Merge branch 'react-panel-options' into bar-gauge-poc 2019-02-16 16:34:56 +01:00
Torkel Ödegaard
22b7864d72 Fixed unit tests 2019-02-16 16:33:29 +01:00
Torkel Ödegaard
42d90fdb7a Merge branch 'react-panel-options' into bar-gauge-poc 2019-02-16 16:02:31 +01:00
Torkel Ödegaard
83d1eb87e5 Began experimenting with a bar gauge 2019-02-16 15:47:33 +01:00
Torkel Ödegaard
4c59a91651 Also remove nested options prop that was there due to bug 2019-02-16 15:46:30 +01:00
Torkel Ödegaard
43e0ad3f93 Moved gauge value options into a sub oject and made editor more generic, will be moved out of gauge pane later and shared between singlestat, gauge, bargauge, honecomb 2019-02-16 15:46:30 +01:00
Torkel Ödegaard
074073787d Added a ReactPanelPlugin as the interface that react panels export, this way react panels have clearer api, and gives us hooks to handle migrations and a way for panel to handle panel changes in the future 2019-02-16 15:46:30 +01:00
Torkel Ödegaard
9035ce4d18 Changed how react panels store their options 2019-02-16 15:46:29 +01:00
Torkel Ödegaard
2d5fd7fdfd
Fixed prettier issue (#15471) 
Fixed prettier CI issue that caused build failures
 2019-02-16 15:45:19 +01:00
Torkel Ödegaard
843f8b04d4 Began experimenting with a bar gauge 2019-02-15 12:55:35 +01:00
Torkel Ödegaard
7699706e65 fixed handling of alert urls with true flags, fixes #15454 2019-02-15 11:23:31 +01:00
Torkel Ödegaard
7fd89ff77a
Merge pull request #15424 from grafana/move-error-boundry 
Move error boundry from DataPanel to PanelChrome
 2019-02-14 18:27:03 +01:00
David
2c92365969
Merge pull request #15305 from avaly/feature/ansi-colors 
Support ANSI colors codes in Loki logs
 2019-02-14 18:01:23 +01:00
Torkel Ödegaard
19a080a4d4 Restored loading spinner to DataPanel 2019-02-14 15:29:36 +01:00
Torkel Ödegaard
79008a7acd added another error message scenario 2019-02-14 15:23:34 +01:00
Torkel Ödegaard
2bc26a01f9 Fixes to error handling and clearing, also publishing of legacy events so old query editors work with react panels fully 2019-02-14 15:18:55 +01:00
Torkel Ödegaard
cc61d9c5cc Merge branch 'master' into move-error-boundry 2019-02-14 13:10:49 +01:00
Peter Holmberg
0c72fb3be1 Merge branch 'master' into move-error-boundry 2019-02-13 16:52:52 +01:00
Torkel Ödegaard
ef9e74fabb Fixed issue with sass variables used from typescript, the prettier lowercases export variables 2019-02-13 16:36:59 +01:00
Peter Holmberg
aad558ce9c using error callback from datapanel instead 2019-02-13 15:54:10 +01:00
Torkel Ödegaard
124b3486eb Merge branch 'master' into 15330-vizpicker-red-when-0-hits 2019-02-13 14:49:11 +01:00
Torkel Ödegaard
cfea8bdcae Prettier had not been running as a precommit hook for some time so had to run in on all files again 2019-02-13 11:14:53 +01:00
Johannes Schill
27bbadce1d feat: Add EmptySearchResult ui component and use it in VizTypePicker 2019-02-13 09:22:09 +01:00
Torkel Ödegaard
3b0ae4bd0a
Merge pull request #15368 from grafana/15217-panels-without-queries 
POC: Panels without queries can skip DataPanel
 2019-02-13 08:06:25 +01:00
Torkel Ödegaard
6be50c952c
Merge pull request #15400 from grafana/removed-icons-in-buttons 
Removed some icons in action button
 2019-02-13 08:05:11 +01:00
Johannes Schill
44eaa3eaa8 Revert "feat: Highlight vizpicker input when there are no panels matching the search query" 
This reverts commit 11db48e76e.
 2019-02-13 07:46:14 +01:00
Dominik Prokop
2542a43ec0 Regenerating variabless sas on theme edit v1 2019-02-12 21:54:20 +01:00
Torkel Ödegaard
f195459b01 Removed some icons in action button 
Trying to align some title case issues
 2019-02-12 17:51:08 +01:00
Dominik Prokop
0a66d8afc7 Merge branch 'master' into cli/watch-sass-var 2019-02-12 17:20:14 +01:00
Peter Holmberg
1c5118748a implement show error in panelcorner 2019-02-12 17:01:07 +01:00
Hugo Häggmark
90d162e608 Merge with master 2019-02-12 16:47:57 +01:00
Hugo Häggmark
222482b6be Forgot about the snapshots 2019-02-12 16:31:11 +01:00
Torkel Ödegaard
ef7236439a
Merge pull request #15391 from grafana/fixed-double-datasource-edit-page 
Fixed issues with double page body and husky pre-commit hook
 2019-02-12 16:28:07 +01:00
Hugo Häggmark
4c74b09a9d Renamed to FilterInput and added label and search icon 2019-02-12 16:22:57 +01:00
Johannes Schill
11db48e76e feat: Highlight vizpicker input when there are no panels matching the search query 2019-02-12 16:19:23 +01:00
Peter Holmberg
9f88a22b4c remove comments 2019-02-12 16:14:26 +01:00
Peter Holmberg
f52aa4de4e Merge branch '15217-panels-without-queries' into move-error-boundry 2019-02-12 16:13:15 +01:00
Peter Holmberg
f0565684c7 Merge branch '15217-panels-without-queries' of https://github.com/grafana/grafana into 15217-panels-without-queries 2019-02-12 16:11:04 +01:00
Peter Holmberg
530a370379 bubble error from datapanel to panelchrome 2019-02-12 16:06:02 +01:00
Torkel Ödegaard
a1453607a9 Changed noQueries to a dataFormats array that will allow a panel to define supported formats and prefered (first in array) 2019-02-12 16:05:29 +01:00
Torkel Ödegaard
bde9e9d5a5
Merge pull request #15394 from grafana/13066-save-as-dashboard 
fix: No need to have edit permissions to be able to "Save as"
 2019-02-12 15:57:41 +01:00
Torkel Ödegaard
8bd7e5a5f4
Merge pull request #15374 from grafana/explore/dedup-selector 
Move deduplication calculation from Logs component to reselect selector
 2019-02-12 14:57:06 +01:00
Torkel Ödegaard
2c4cb03cd3 Fixed issues with double page body and husky pre-commit hook 2019-02-12 14:41:12 +01:00
Johannes Schill
335042b2d0 fix: No need to have edit permissions to be able to "Save as" a dashboard 2019-02-12 14:29:27 +01:00
Dominik Prokop
dd19ec3b22 Move explore selectors to a separate file 2019-02-12 12:36:46 +01:00
Johannes Schill
c3965e332d chore: Rename renderPanel to renderPanelBody 2019-02-12 12:28:53 +01:00
Johannes Schill
d5918498da chore: Rename renderDataPanel to renderPanel 2019-02-12 12:28:53 +01:00
Johannes Schill
01208ccd68 chore: Rename renderHelper > renderDataPanel and move logic to smaller functions 2019-02-12 12:28:53 +01:00
Johannes Schill
b5dbf26dc4 chore: PR feedback, shorten boolean check 2019-02-12 12:28:53 +01:00
Johannes Schill
075fb8e91c chore: Rename isDataPanel to noQueries 2019-02-12 12:28:53 +01:00
Johannes Schill
b7b1a79405 chore: Only show Queries tab for panel plugins with isDataPanel set to true 2019-02-12 12:28:53 +01:00
Johannes Schill
d3115325a9 feat: Only use the DataPanel component when panel plugin has isDataPanel set to true in plugin.json. And fix PanelData when using snapshots 2019-02-12 12:28:53 +01:00
Johannes Schill
3f64d61fd2 feat: Add util to convert snapshotData to PanelData 2019-02-12 12:28:53 +01:00
Peter Holmberg
1db5d86b12 Merge branch '15217-panels-without-queries' into move-error-boundry 2019-02-12 10:54:55 +01:00
Peter Holmberg
7d0edb285d Revert "hard move" 
This reverts commit a2dad6157a.
 2019-02-12 10:53:05 +01:00
Johannes Schill
be58e275a5 chore: PR feedback, shorten boolean check 2019-02-12 09:55:09 +01:00
Johannes Schill
2db9cb3d93 chore: Rename isDataPanel to noQueries 2019-02-12 09:48:46 +01:00
Torkel Ödegaard
38a74c6444
Merge pull request #15383 from bergquist/test_provisoned_ds 
enable testing provsioned datasources
 2019-02-12 09:48:36 +01:00
Hugo Häggmark
25dbca9585 Merge with master 2019-02-12 08:50:05 +01:00
Hugo Häggmark
5388541fd7 Fixes bug #12972 with a new type of input that escapes and unescapes special regexp characters 2019-02-12 08:48:54 +01:00
bergquist
3b9105e1be enable testing provsioned datasources 
closes #12164
 2019-02-12 08:45:21 +01:00
Torkel Ödegaard
fc91e1cf57 Fixed issue with gauge requests being cancelled 2019-02-11 17:47:47 +01:00
Torkel Ödegaard
a79bd42414
Merge pull request #15306 from grafana/explore/dedup-strategu-url 
Persist deduplication strategy in url
 2019-02-11 17:12:41 +01:00
Dominik Prokop
1693f083cc Move deduplication calculation from Logs component to redux selector 2019-02-11 16:57:49 +01:00
Torkel Ödegaard
afc2efa56d Removed plus icons 2019-02-11 16:45:47 +01:00
Peter Holmberg
a2dad6157a hard move 2019-02-11 16:44:09 +01:00
Torkel Ödegaard
8e93b68e6d restoring green CTA 2019-02-11 16:38:05 +01:00
Torkel Ödegaard
b920ee0ea3 Merge branch 'master' into ui-new-red-green-blue 2019-02-11 16:26:58 +01:00
Torkel Ödegaard
b93cdf56fb Removed double page container 2019-02-11 16:26:02 +01:00
Johannes Schill
0019e0ffc9 chore: Only show Queries tab for panel plugins with isDataPanel set to true 2019-02-11 16:21:54 +01:00
Torkel Ödegaard
4408817e65 Fixed double page class on api keys and org details page 2019-02-11 15:18:11 +01:00
Torkel Ödegaard
931bece16e Merge branch 'master' into ui-new-red-green-blue 2019-02-11 15:00:00 +01:00
Torkel Ödegaard
962815169e Color tweaks 2019-02-11 14:58:11 +01:00
Daniel Lee
52fe6b0316
Merge pull request #15198 from CorpGlory/azure-monitor-refactor-#15087 
Azure Monitor: refactor #15087
 2019-02-11 14:19:42 +01:00
Dominik Prokop
85780eb30c Remove not related code 2019-02-11 13:18:16 +01:00
Torkel Ödegaard
a4dd63e224 Merge branch 'master' into ui-new-red-green-blue 2019-02-11 13:04:25 +01:00
Dominik Prokop
cee2e4788b Do not read store state from toggle panelaction creator 2019-02-11 12:56:37 +01:00
Torkel Ödegaard
6f16f70456
Merge pull request #15354 from grafana/fix/plugin-loading-failure 
Fix plugin loading failure message not being displayed
 2019-02-11 12:49:08 +01:00
Dominik Prokop
14bf960b64 Merge branch 'master' into explore/dedup-strategu-url 2019-02-11 12:03:45 +01:00
Dominik Prokop
c9fbd43231 Review changes 2019-02-11 11:59:48 +01:00
Torkel Ödegaard
ba2f698b81
Merge pull request #15352 from grafana/fixed-missing-graph-time-axis 
Fixed missing time axis on graph due to width not being passed
 2019-02-11 11:50:04 +01:00
Dominik Prokop
9485c67827 Fix plugin loading failure message not being displayed 2019-02-11 11:47:12 +01:00
Torkel Ödegaard
b780b6377a Fixed missing time axis on graph due to width not being passed 2019-02-11 11:17:23 +01:00
Dominik Prokop
f39fef2a02 Clear visualization picker search on picker close 2019-02-11 11:03:24 +01:00
Torkel Ödegaard
a402a3713f
Merge pull request #15339 from grafana/navbar-back-btn 
Navbar back btn
 2019-02-11 10:28:47 +01:00
Patrick O'Carroll
c34021344a
Merge branch 'master' into ui-new-red-green-blue 2019-02-11 09:17:19 +01:00
Marcus Efraimsson
75f89ecf1f
Merge pull request #14888 from bugficks/8570-mysql-ssl-datasource 
MySQL SSL CA in datasource connector
 2019-02-11 09:00:18 +01:00
Torkel Ödegaard
f38e64cc5d Navbar back button, no title edit this time 2019-02-10 20:01:22 +01:00
Torkel Ödegaard
a0729b9b50 provide time range to angular query controllers 2019-02-10 17:05:58 +01:00
Torkel Ödegaard
748cb44911 Fixed issues with plus button in threshold and panel option header, and current state in viz picker, fixes #15329 2019-02-08 21:53:51 +01:00
Dominik Prokop
512aa62efc Update config mock in metrics panel controller test 2019-02-08 11:50:05 +01:00
Johannes Schill
ec02ddd27b feat: Only use the DataPanel component when panel plugin has isDataPanel set to true in plugin.json. And fix PanelData when using snapshots 2019-02-07 21:34:50 +01:00
Johannes Schill
8d4caa593e feat: Add util to convert snapshotData to PanelData 2019-02-07 21:31:05 +01:00
Torkel Ödegaard
df17f7dc45 fixed explore width-0 issue, fixes #15304 2019-02-07 18:20:16 +01:00
Dominik Prokop
229d646bfc Persis deduplication strategy in url 2019-02-07 18:01:09 +01:00
Valentin Agachi
ec0e03e547 Support ANSI colors codes in Loki logs 
Closes #15114
 2019-02-08 00:49:39 +08:00
Torkel Ödegaard
e080983147 Panel edit navbar poc 2019-02-07 16:14:11 +01:00
corpglory-dev
0cc9cbcb54 Merge branch 'master' into azure-monitor-refactor-#15087 2019-02-07 16:59:49 +03:00
Torkel Ödegaard
78ea7ae783
Merge pull request #15212 from grafana/dashboard-react-page 
Dashboard react page
 2019-02-07 14:23:44 +01:00
Torkel Ödegaard
00a676ff86
Merge pull request #15292 from mtanda/template_json_format 
support json format templating
 2019-02-07 14:05:09 +01:00
Torkel Ödegaard
8c65430ea3
Merge pull request #15251 from grafana/14822-use-autosizer 
Remove react-sizeme and use AutoSizer
 2019-02-07 14:03:25 +01:00
Torkel Ödegaard
2eca4caa5d added reducers tests 2019-02-07 13:58:24 +01:00
Torkel Ödegaard
61e9148eed added way to test action called from react component 2019-02-07 12:02:01 +01:00
Torkel Ödegaard
5f808ddf22 Added annother initDashboard test 2019-02-07 11:17:31 +01:00
Torkel Ödegaard
8b080f0511 Simplified condition 2019-02-07 09:09:59 +01:00
Mitsuhiro Tanda
4bd94b8aba support json format templating 2019-02-07 14:07:41 +09:00
Torkel Ödegaard
baeec495a2 Fixed some remaining issues 2019-02-06 21:32:48 +01:00
Torkel Ödegaard
961695a61f Improved dashboard page test 2019-02-06 21:08:15 +01:00
Torkel Ödegaard
a4841a72d9 Improved dashboard page test 2019-02-06 21:04:18 +01:00
Torkel Ödegaard
dd0afd0a0b Big refactoring for dashboard init redux actions 2019-02-06 19:42:04 +01:00
Torkel Ödegaard
8574dca081 making changes suggested in review and improving typings 2019-02-06 17:31:52 +01:00
Torkel Ödegaard
a53c3b45fc Added a basic test for initDashboard thunk 2019-02-06 14:35:53 +01:00
corpglory-dev
e58f3a678d Merge branch 'master' into azure-monitor-refactor-#15087 2019-02-06 14:31:23 +03:00
Torkel Ödegaard
08a86250be Merge branch 'dashboard-react-page' of github.com:grafana/grafana into dashboard-react-page 2019-02-06 11:34:08 +01:00
Torkel Ödegaard
865d1567fc Added DashboardPage tests that tests view mode transition logic 2019-02-06 11:30:42 +01:00
Johannes Schill
c47c2528aa Revert "chore: Replace sizeMe with AutoSizer in DashboardGrid" 
This reverts commit ae0b027d69.
 2019-02-06 09:45:09 +01:00
Torkel Ödegaard
1fbdd02464 wip: tests 2019-02-06 09:04:38 +01:00
Torkel Ödegaard
4d2cff41ff Minor code simplification 2019-02-05 19:38:51 +01:00
Torkel Ödegaard
2196b4f1c2
Delete template.html 2019-02-05 19:34:31 +01:00
Torkel Ödegaard
fa32198831 Merge branch 'master' into dashboard-react-page 2019-02-05 17:56:04 +01:00
Torkel Ödegaard
80ccea3d85
Merge pull request #15254 from grafana/update-add-panel-flow 
Update add panel flow
 2019-02-05 17:51:49 +01:00
Torkel Ödegaard
096751b658 Updated add panel related flows 2019-02-05 17:15:21 +01:00
Torkel Ödegaard
a0bd022186
Merge pull request #15259 from grafana/hugoh/clicking-outside-timepicker-should-hide-it 
Clicking outside TimePicker (Angular & React versions) should close it
 2019-02-05 16:46:47 +01:00
Torkel Ödegaard
f5249d6033 Breaking init dashboard up in to fetch & init 2019-02-05 15:58:09 +01:00
Hugo Häggmark
e42b670f5c Closing timepicker when clicking outside the picker 2019-02-05 15:41:00 +01:00
Torkel Ödegaard
49a597fcd0 Moved remove panel logic to dashboard srv 2019-02-05 15:15:15 +01:00
Torkel Ödegaard
a624c9713a Removed unused controllers and services 2019-02-05 15:09:56 +01:00
Torkel Ödegaard
6d874dd1f1 Improved error handling 2019-02-05 14:42:29 +01:00
Johannes Schill
e103143634 fix: Update snapshot 2019-02-05 14:42:18 +01:00
Johannes Schill
f5431f5210 chore: Explore: Remove inner AutoSizer, spread the size-object to width/height, change height type to number 2019-02-05 14:42:18 +01:00
Johannes Schill
d68df9d704 fix: Calculation issue with AutoSizer in explore 2019-02-05 14:42:18 +01:00
Johannes Schill
097396c517 chore: Replace withSize with AutoSizer in explore/Graph.tsx 2019-02-05 14:42:18 +01:00
Johannes Schill
ae0b027d69 chore: Replace sizeMe with AutoSizer in DashboardGrid 2019-02-05 14:42:18 +01:00
Torkel Ödegaard
da53103281 Prevent viewers from going into edit mode 2019-02-05 14:18:35 +01:00
Torkel Ödegaard
aa2bf07c71 Expand rows for panels in collapsed rows 2019-02-05 14:12:32 +01:00
Torkel Ödegaard
08925ffad8 Basic loading state for slow dashboards 2019-02-05 13:53:11 +01:00
Hugo Häggmark
9ba98b8703 Fixes #15223 by handling onPaste event because of bug in Slate 2019-02-05 13:13:52 +01:00
Torkel Ödegaard
bbc5dff7bd Fixed add panel should scroll to top 2019-02-05 12:56:03 +01:00
Peter Holmberg
2802569529 minor layout change, simple render test 2019-02-05 12:47:42 +01:00
Torkel Ödegaard
fd1ef0a2be Added custom scrollbar and remember scroll pos to jump back to same scroll pos when going back to dashboard from edit mode 2019-02-05 12:10:42 +01:00
ijin08
0642c52693 created new color variables, changed primary to blue, changed success-btns to primary-btns. 2019-02-05 12:05:02 +01:00
Torkel Ödegaard
04f190c3e3 Updated playlist test 2019-02-05 11:11:17 +01:00
Torkel Ödegaard
44cef757e5 Merge branch 'hugoh/explore-refactor-initial-modified-queries' 2019-02-05 09:33:28 +01:00
Torkel Ödegaard
bfdfb215f3 added missing typing to explore props 2019-02-05 09:32:42 +01:00
Torkel Ödegaard
e4c92ae124 added comment to initDashboard 2019-02-05 09:24:30 +01:00
Torkel Ödegaard
3d5ca99d53 Merge branch 'dashboard-react-page' of github.com:grafana/grafana into dashboard-react-page 2019-02-05 09:24:14 +01:00
Torkel Ödegaard
28fc27c4ae Merge branch 'master' of github.com:grafana/grafana into dashboard-react-page 2019-02-05 09:23:58 +01:00
Hugo Häggmark
3b0a04c627 Fixed so onBlur event trigger an QueryChange and QueryExecute if values differ 2019-02-05 07:03:16 +01:00
Hugo Häggmark
2c255fd85a Renamed initialQueries to queries 2019-02-05 06:19:40 +01:00
Torkel Ödegaard
d29e1278dc render after leaving fullscreen 2019-02-04 21:39:48 +01:00
Peter Holmberg
e4dad78045 added flags to vizpicker from query param 2019-02-04 21:26:49 +01:00
Torkel Ödegaard
70974c01f2 Added playlist controls to new react DashNav 2019-02-04 21:08:30 +01:00
Torkel Ödegaard
d978a66ef6 Fixed lots of loading flow issues and updated solo route page 2019-02-04 18:24:56 +01:00
Torkel Ödegaard
23ac9405c1 Set page title on dashboard load 2019-02-04 17:39:29 +01:00
Torkel Ödegaard
3baaf2c3e4 Added handling of kiosk mode 2019-02-04 17:36:04 +01:00
Johannes Schill
9ab5eeb7f3 fix: Explore: Query wrapping on long queries #15222 2019-02-04 17:26:20 +01:00
Peter Holmberg
f6b46f7a34 prepping go to visualization 2019-02-04 17:18:46 +01:00
Peter Holmberg
b9c58d88dc basic layout 2019-02-04 16:48:27 +01:00
Torkel Ödegaard
fdeea9144c fixed unit test 2019-02-04 15:50:47 +01:00
Torkel Ödegaard
7162583396 Made dashboard view state srv panel view state obsolete 2019-02-04 15:44:08 +01:00
Hugo Häggmark
f74ebdade6 Missed to save 2019-02-04 15:11:19 +01:00
Hugo Häggmark
a0c4837eb5 Merge with master 2019-02-04 15:06:01 +01:00
Torkel Ödegaard
f695975f65 Fixed handling of orgId 2019-02-04 15:02:35 +01:00