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
19,874 Commits 5,447 Branches 554 Tags 1.9 GiB
e2c958eb43
Commit Graph

3917 Commits

Author SHA1 Message Date
Torkel Ödegaard
433c88a616 two minor bug fixes introduced in recent refactorings 2019-01-29 09:47:41 +01:00
Torkel Ödegaard
0de861a3a8 Minor progress on react query editor support, solving updating query persisted state 2019-01-29 09:39:23 +01:00
Torkel Ödegaard
57fe7d5050
Merge pull request #15103 from grafana/14762-page-component-everywhere 
Page component on all React pages pt2
 2019-01-29 08:15:46 +01:00
Torkel Ödegaard
6dad4cce07 Updated Explore query styles to align them to other query editor to make them fit in better 2019-01-29 08:14:07 +01:00
Torkel Ödegaard
e4244d8bf8 Merge branch 'master' into loki-query-editor 2019-01-29 07:10:06 +01:00
Torkel Ödegaard
459a93da10
Merge pull request #15100 from grafana/annotation-dashboard-switch-fix 
Fix for annotations not clearing when switching dashboards
 2019-01-29 06:53:20 +01:00
Johannes Schill
186ed1a333 chore: Fix typings and add Page-component to FolderPermissions #14762 2019-01-28 23:19:19 +01:00
Johannes Schill
ab62a09fe6 chore: Fix typings and add Page-component to ServerStats #14762 2019-01-28 23:19:19 +01:00
Johannes Schill
d54c4173ca chore: Fix typings and add Page-component to AlertRuleList #14762 2019-01-28 23:19:19 +01:00
Johannes Schill
e448a140f5 chore: Fix typings and add Page-component to DataSourceDashboards #14762 2019-01-28 23:19:19 +01:00
Johannes Schill
7df00747d3 chore: Fix typings and add Page-component to NewDataSourcePage #14762 2019-01-28 23:19:19 +01:00
Johannes Schill
98fa17f0e4 chore: Fix typings and add Page-component to DataSourceSettingsPage #14762 2019-01-28 23:19:19 +01:00
Johannes Schill
3372dc9441 chore: Fix typings and add Page-component to FolderSettingsPage #14762 2019-01-28 23:19:19 +01:00
Johannes Schill
d9a25ee505 test: Updated snapshot 2019-01-28 23:19:18 +01:00
Johannes Schill
730036e18d chore: Fix typings and add Page-component to TeamPages #14762 2019-01-28 23:19:18 +01:00
Carl Bergquist
c6f80ecec2
Merge pull request #14229 from pbakulev/configurable-alert-notification 
Configurable alert notification
 2019-01-28 22:47:12 +01:00
Torkel Ödegaard
daab7a5f6e
Merge pull request #15099 from grafana/tooling/storybook-poc 
Named colors & storybook
 2019-01-28 20:47:46 +01:00
Daniel Lee
e4f4cb814c Merge branch 'master' into azure-monitor 2019-01-28 19:23:34 +01:00
Torkel Ödegaard
c3c8cd3f4d Fix for annotations not clearing when switching dashboards, fixes #15063 2019-01-28 18:19:12 +01:00
Torkel Ödegaard
8510f0cd11
Merge pull request #15084 from grafana/fix/explore-datasource-change 
Update datasource before the loading has started
 2019-01-28 17:55:33 +01:00
Dominik Prokop
7a8eb8c115 Merge branch 'master' into tooling/storybook-poc 2019-01-28 17:36:41 +01:00
Torkel Ödegaard
fd06e51776 Merge branch 'master' into fix/explore-do-not-clear-results 2019-01-28 17:16:39 +01:00
Torkel Ödegaard
5768593da7
Merge pull request #15095 from grafana/hugoh/bug-inifinite-loop-when-scan-for-older-logs-clicked 
Making sure we do not pass a long invalid queries and save to state
 2019-01-28 17:01:24 +01:00
Torkel Ödegaard
a1a905cbb1 Removed the initial data source as I could not see it being used anywhere 2019-01-28 16:31:38 +01:00
Hugo Häggmark
08f5a3338a Making sure we do not pass a long invalid queries and save to state 2019-01-28 15:27:35 +01:00
Torkel Ödegaard
91d926f180 single import for types from @grafana/ui 2019-01-28 15:27:23 +01:00
Torkel Ödegaard
2c9a867bde Merge branch 'master' into fix/explore-datasource-change 2019-01-28 15:24:14 +01:00
Torkel Ödegaard
994c79b59b Merge branch '15048/navigate-from-not-saved-panel' 2019-01-28 14:45:49 +01:00
Torkel Ödegaard
520756fb4c Fixed wrong line in test 2019-01-28 14:44:35 +01:00
Hugo Häggmark
dc125f1e4d Made sure we only resetTypeahead if mounted 2019-01-28 14:43:59 +01:00
bergquist
6a8643b3d1 Merge branch 'master' into configurable-alert-notification 
* master: (250 commits)
  Firing off an action instead of listening to location changes
  Changes after PR Comments
  Made ExplorerToolbar connected and refactored away responsabilities from Explore
  Removed some split complexity
  Fixed some more styling
  Fixed close split look and feel
  Fixed position of Closesplit
  Fixed small issue with TimePicker dropdown position
  Simplified some styles and dom elements
  Fixed some more with the sidemenu open and smaller screens
  Fixed so heading looks good with closed sidemenu
  Restructure of component and styling
  Refactored out ExploreToolbar from Explore
  Fixed reinitialise of Explore
  changelog: add notes about closing #13929
  changelog: add notes about closing #14558
  changelog: add notes about closing #14484
  changelog: add notes about closing #13765
  changelog: add notes about closing #11503
  changelog: add notes about closing #4075
  ...
 2019-01-28 14:16:43 +01:00
Peter Holmberg
d433a4792a fixing test 2019-01-28 14:07:37 +01:00
bergquist
48aa173f67 support both uid and id for showing/removing notifiers 2019-01-28 14:00:55 +01:00
David
edfce0893e
Merge pull request #15090 from grafana/hugoh/bug-explore-cant-go-from-dashboard-to-explore 
Fixed reinitialise of Explore
 2019-01-28 13:43:32 +01:00
Dominik Prokop
07331b4c07 Revert "Use the same panel loading indicator in explore as on dashboard's panel" 
This reverts commit 05edb3e5ad.
 2019-01-28 13:40:41 +01:00
Hugo Häggmark
6b0400eed2 Firing off an action instead of listening to location changes 2019-01-28 13:27:56 +01:00
Dominik Prokop
957c659291 Handle undefined graph and table results 2019-01-28 13:09:51 +01:00
Dominik Prokop
05edb3e5ad Use the same panel loading indicator in explore as on dashboard's panel 2019-01-28 12:58:10 +01:00
Dominik Prokop
2ff62c42ac Prevents query result cleaning when new query trransaction starts 2019-01-28 12:57:09 +01:00
Hugo Häggmark
9298876ef0 Changes after PR Comments 2019-01-28 12:47:01 +01:00
Hugo Häggmark
1e6d50df7a Made ExplorerToolbar connected and refactored away responsabilities from Explore 2019-01-28 12:47:01 +01:00
Hugo Häggmark
21df0c90a9 Removed some split complexity 2019-01-28 12:47:01 +01:00
Hugo Häggmark
0a094a13f2 Fixed some more styling 2019-01-28 12:47:01 +01:00
Hugo Häggmark
18727dce23 Fixed close split look and feel 2019-01-28 12:47:01 +01:00
Hugo Häggmark
d2a5477654 Fixed small issue with TimePicker dropdown position 2019-01-28 12:47:01 +01:00
Hugo Häggmark
032a82feed Simplified some styles and dom elements 2019-01-28 12:47:01 +01:00
Hugo Häggmark
9caaf25078 Fixed some more with the sidemenu open and smaller screens 2019-01-28 12:47:01 +01:00
Hugo Häggmark
b2c284e42c Fixed so heading looks good with closed sidemenu 2019-01-28 12:47:01 +01:00
Hugo Häggmark
ffe03ee22d Restructure of component and styling 2019-01-28 12:47:01 +01:00
Hugo Häggmark
1aefc4cc2d Refactored out ExploreToolbar from Explore 2019-01-28 12:47:01 +01:00
Peter Holmberg
c9cab9b677 updating state if no panel 2019-01-28 12:20:16 +01:00
Hugo Häggmark
40f410562a Fixed reinitialise of Explore 2019-01-28 11:45:15 +01:00
Dominik Prokop
05f9eb0766 Update datasource before the loading has started 2019-01-28 11:06:50 +01:00
Torkel Ödegaard
7f2c2a913e Moving a few things from dashboard folder 2019-01-27 17:33:13 +01:00
Torkel Ödegaard
f3dc5381ee
Merge pull request #15018 from miroswan/14961-constructor-as-rvalue 
Bug Fix #14961
 2019-01-26 11:11:32 +01:00
Torkel Ödegaard
c9d060c0fe
Merge pull request #15041 from grafana/14752-explore-custom-scrollbar 
Use CustomScrollbar in explore
 2019-01-26 10:57:13 +01:00
Torkel Ödegaard
5e1a3c9ee2
Merge pull request #15023 from grafana/improve-organization 
More file re-organization & clean-up
 2019-01-26 10:53:09 +01:00
Dominik Prokop
1d3122632f Move Switch component to grafana-ui 2019-01-24 15:35:50 +01:00
Demitri Swan
186e488ace Bug Fix #14961 2019-01-24 14:11:31 +00:00
Johannes Schill
2706f09de8 feat: Use CustomScrollbar in explore #14752 2019-01-24 12:59:12 +01:00
Torkel Ödegaard
05738258bb Fixed dashboard import issue after move 2019-01-24 09:47:06 +01:00
Torkel Ödegaard
e713b0f029 Moved add panel panel and renamed it to add panel widget 2019-01-24 09:23:48 +01:00
Torkel Ödegaard
11c306abde Moved row options to it's own component folder 2019-01-23 20:29:05 +01:00
Torkel Ödegaard
adacdf98b7 Removed old query inspector (that was opened by clickin error in panel title) 
think the new query insector from Queries tab can replace this old one.
 2019-01-23 20:26:18 +01:00
Torkel Ödegaard
9d5560afe2 Moving files to better locations 2019-01-23 20:21:07 +01:00
Torkel Ödegaard
b1ef3c43f9 Disable query should trigger refresh 2019-01-23 19:34:56 +01:00
Torkel Ödegaard
02083d71c8 Loki query editor is starting to work, had to make changes to explore query field in order to update query from the outside without unmount between 2019-01-23 17:44:22 +01:00
Torkel Ödegaard
d420024178
Merge pull request #15009 from grafana/davkal/14997-fix-scanner 
Explore: Fix scanning for logs
 2019-01-23 15:35:31 +01:00
Torkel Ödegaard
3dca65c6b8
Merge pull request #14958 from aocenas/refresh-playlist-counter 
Add loop counter for full refresh in playlist
 2019-01-23 15:34:49 +01:00
David Kaltschmidt
c0277ab595 Explore: Fix scanning for logs 
- Redux migration caused the scanner to not be set
- this change adds the setting/unsetting of the scanner in the reducer
- added test
 2019-01-23 15:05:54 +01:00
Torkel Ödegaard
f0eef79c1a Moved ad hoc filters and upload directive 2019-01-23 13:31:45 +01:00
Torkel Ödegaard
2f08c56260 Moved dashboard srv and snapshot ctrl 2019-01-23 13:10:49 +01:00
Torkel Ödegaard
80da19010e Moved share modal 2019-01-23 13:07:20 +01:00
Torkel Ödegaard
720fa87b89 Moved dashboard save modals to components folder 2019-01-23 13:00:05 +01:00
Torkel Ödegaard
4358732d21 Moved unsaved changes service and modal 2019-01-23 12:52:46 +01:00
Torkel Ödegaard
a4824085e3 Removed unused alertingSrv 2019-01-23 12:09:58 +01:00
Torkel Ödegaard
874792dfcb Moved view state srv to services 2019-01-23 12:02:47 +01:00
Torkel Ödegaard
ec37f84727 Moved timepicker to components 2019-01-23 11:55:52 +01:00
Torkel Ödegaard
2356057f20 Moved submenu into components dir 2019-01-23 11:51:43 +01:00
Torkel Ödegaard
08f7e55ae5 Moved dashboard settings to components 2019-01-23 11:48:27 +01:00
Torkel Ödegaard
dfe9252f54 Moved dashboard permissions into components dir 2019-01-23 11:45:23 +01:00
Torkel Ödegaard
0c16d3cd6a Moved history component, added start draft of frontend code style guide 2019-01-23 11:37:46 +01:00
Torkel Ödegaard
26385dea8f Began work on improving structure and organization of components under features/dashboard, #14062 2019-01-22 21:36:36 +01:00
Torkel Ödegaard
2264c27504
Merge pull request #14989 from grafana/hugoh/bug-folder-name-appears-misleadingly-when-using-viewers-can-edit 
fixes:#14282 - Do not change folder for persisted dashboards
 2019-01-22 17:47:12 +01:00
Torkel Ödegaard
2a50777001 use resetfolder instead so it shows current folder 2019-01-22 17:41:36 +01:00
Torkel Ödegaard
5d3ef4e500
Merge pull request #14992 from grafana/hugoh/bug-explore-toggle-table-does-not-work 
fix: Dispatch the correct action (#14985)
 2019-01-22 16:43:36 +01:00
Benjamin Schweizer
bde4b76c16 based on encodeURIComponent() using strict RFC 3986 sub-delims 2019-01-22 15:09:58 +01:00
Hugo Häggmark
85838a40d6 fix: Dispatch the correct action (#14985) 2019-01-22 13:59:58 +01:00
Hugo Häggmark
151b838f0b fixes:#14282 - Do not change folder for persisted dashboards 2019-01-22 13:07:03 +01:00
Benjamin Schweizer
8a09d84707 Merge branch 'master' of https://github.com/grafana/grafana 2019-01-22 11:20:56 +01:00
Torkel Ödegaard
e43fafd96e Explore: mini styling fix for angular query editors 2019-01-22 10:46:21 +01:00
Torkel Ödegaard
a03faba9a3
Merge pull request #14983 from grafana/hugoh/logs-refactoring 
Logs refactoring
 2019-01-22 10:32:05 +01:00
Torkel Ödegaard
5446f49f19
Merge pull request #14977 from grafana/explore-fix-datasource-selector 
Fixed data source selection in explore
 2019-01-22 09:36:02 +01:00
Hugo Häggmark
bcb3824e6a Minor rename of LogsProps and LogsState 2019-01-22 09:25:40 +01:00
Hugo Häggmark
c369279401 Splitted up LogLabels into LogLabelStats and LogLabel 2019-01-22 09:22:38 +01:00
Dominik Prokop
e35e266c81 Fix TS errors 2019-01-22 09:11:30 +01:00
Dominik Prokop
4384eb2f0b Move tooltip themes to Tooltip component making Popper/PopperController theme agnostic 2019-01-22 09:11:30 +01:00
Hugo Häggmark
23202ab130 Refactored out LogRow to a separate file 2019-01-22 08:59:22 +01:00
Torkel Ödegaard
79bd7f4077 Fixed data source selection in explore 2019-01-21 21:36:30 +01:00
Torkel Ödegaard
018fef0400 Added refId to missing queries on panel model init 2019-01-21 20:35:24 +01:00