IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-13 00:55:47 -06:00
Code Issues Packages Projects Releases Wiki Activity
22,197 Commits 5,451 Branches 554 Tags 1.9 GiB
3a18098760
Commit Graph

410 Commits

Author SHA1 Message Date
Torkel Ödegaard
2d5fd7fdfd
Fixed prettier issue (#15471) 
Fixed prettier CI issue that caused build failures
 2019-02-16 15:45:19 +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
Hugo Häggmark
90d162e608 Merge with master 2019-02-12 16:47:57 +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
Dominik Prokop
dd19ec3b22 Move explore selectors to a separate file 2019-02-12 12:36:46 +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
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
Dominik Prokop
cee2e4788b Do not read store state from toggle panelaction creator 2019-02-11 12:56:37 +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
b780b6377a Fixed missing time axis on graph due to width not being passed 2019-02-11 11:17:23 +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
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
8c65430ea3
Merge pull request #15251 from grafana/14822-use-autosizer 
Remove react-sizeme and use AutoSizer
 2019-02-07 14:03:25 +01:00
corpglory-dev
e58f3a678d Merge branch 'master' into azure-monitor-refactor-#15087 2019-02-06 14:31:23 +03:00
Torkel Ödegaard
fa32198831 Merge branch 'master' into dashboard-react-page 2019-02-05 17:56:04 +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
Hugo Häggmark
e42b670f5c Closing timepicker when clicking outside the picker 2019-02-05 15:41:00 +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
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
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
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
Johannes Schill
9ab5eeb7f3 fix: Explore: Query wrapping on long queries #15222 2019-02-04 17:26:20 +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
Hugo Häggmark
34dd1a22ab Fixed bug with removing a QueryRow thats not part of nextQueries 2019-02-04 14:16:15 +01:00
Torkel Ödegaard
b58a3c939c
Merge pull request #15194 from grafana/explore/url 
Explore - UI panels state persistance in url
 2019-02-04 14:10:50 +01:00
Hugo Häggmark
96aef3bab8 Replaced intialQueris with queryKeys 2019-02-04 13:41:29 +01:00
Hugo Häggmark
5e2b9e40a2 Added more typings 2019-02-04 11:25:07 +01:00
Torkel Ödegaard
217468074f added submenu, made sure submenu visibility is always up to date 2019-02-04 11:19:45 +01:00
Hugo Häggmark
6b98b05976 Removed modifiedQueries from state 2019-02-04 11:07:32 +01:00
Hugo Häggmark
1f5bb76718 Refactor of action, actionTypes and reducer 2019-02-04 07:50:17 +01:00
Hugo Häggmark
2d0fd96621 More types and some refactoring 2019-02-04 07:50:17 +01:00
Hugo Häggmark
acea1d7f00 Alignment of interfaces and components 2019-02-04 07:50:17 +01:00
Hugo Häggmark
43f8098981 Removed the on every key change event 2019-02-04 07:48:25 +01:00
Dominik Prokop
3c358e406e Make runQueries action independent from datasource loading 2019-02-01 14:56:54 +01:00
Torkel Ödegaard
740e1a0540 Made really good progress on loki support in dashboards 2019-02-01 13:30:15 +01:00
Dominik Prokop
2ddccb4a21 Temporarily run queries independently from UI state of explore panels 2019-02-01 12:57:09 +01:00
corpglory-dev
cf60ae79c3 Move prism to app/features/explore 2019-02-01 14:47:17 +03:00
Dominik Prokop
6ab9355146 Restoring explore panels state from URL 2019-02-01 12:33:15 +01:00
Torkel Ödegaard
6e0b873739 Merge branch 'master' into loki-query-editor 2019-02-01 11:17:22 +01:00
Torkel Ödegaard
6663b2fab9 Moved time_srv to services folder, this should not belong to dashboard feature but it is too dependant on dashboard to move it out now, needs a bigger refactoring to isolate from dashboard 2019-01-31 08:44:46 +01:00
Dominik Prokop
661de1efe1 Rename SetInitialQueries action to QueriesImported 2019-01-30 09:50:28 +01:00
Dominik Prokop
d746df485c Add missing code 2019-01-30 09:36:23 +01:00
Dominik Prokop
ca0d2996f2 Merge branch 'master' into explore/queries-import-changes 2019-01-30 09:30:10 +01:00
Torkel Ödegaard
4c689fce96
Merge pull request #15121 from grafana/davkal/15011-fix-query-change-twice 
Explore: query field should not propagate non-text change
 2019-01-29 20:29:47 +01:00
David Kaltschmidt
8d44ed8d8f Explore: query field should not propagate non-text change 
- after mounting with an initial value, the onChange of a query field is triggered
- even though the slate documents are not the same, their text values are identical, hence the change propagation is useless
- added check to propagate text change only when text has actually changed
 2019-01-29 15:53:51 +01:00
Dominik Prokop
9ddbfed730 Wait for queries to be imported before proceeding with datasource change 2019-01-29 15:52:36 +01:00
Dominik Prokop
8ea72eeaf7 Remove commented code 2019-01-29 15:40:01 +01:00
Torkel Ödegaard
0ac0588583
Merge pull request #15107 from grafana/explore-query-styles 
Updated Explore query styles to align them to other query editors
 2019-01-29 15:38:06 +01:00
Dominik Prokop
010f902003 Import queries before datasource is changed 2019-01-29 15:34:28 +01:00
Torkel Ödegaard
d53a430c82 Fixed issue with explore changeTime redux action not being hooked up, fixes #15115 2019-01-29 14:58:57 +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
daab7a5f6e
Merge pull request #15099 from grafana/tooling/storybook-poc 
Named colors & storybook
 2019-01-28 20:47:46 +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
Hugo Häggmark
dc125f1e4d Made sure we only resetTypeahead if mounted 2019-01-28 14:43:59 +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
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
Dominik Prokop
1d3122632f Move Switch component to grafana-ui 2019-01-24 15:35:50 +01:00
Johannes Schill
2706f09de8 feat: Use CustomScrollbar in explore #14752 2019-01-24 12:59:12 +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
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
Hugo Häggmark
85838a40d6 fix: Dispatch the correct action (#14985) 2019-01-22 13:59:58 +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
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
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
8a4ce3e4cc
Merge pull request #14945 from grafana/hugoh/bug-misalignment-of-explore-panels 
Hack for getting the same height in splitted view
 2019-01-18 15:09:17 +01:00
Hugo Häggmark
11944adc9c fix: Hack for getting the same height in splitted view, view could use refactor IMHO #14853 2019-01-18 12:03:16 +01:00
Torkel Ödegaard
f2498645d0 Fixed issue with explore angular query editor support introduced by recent angular query editor changes 2019-01-18 11:20:55 +01:00
Torkel Ödegaard
205e2acdd8 Added data source type to explore state 2019-01-17 19:17:29 +01:00
Torkel Ödegaard
ecab597e5e renaming DataSource type to DataSourceSettings and moved to grafana ui 2019-01-17 18:51:07 +01:00
Torkel Ödegaard
febb9e7168 Moved data source and data query types 2019-01-17 17:59:47 +01:00
David
6f6c4652dc
Merge pull request #14928 from grafana/davkal/14926-loki-missing 
Explore: Fix datasource selector being empty with single datasource
 2019-01-17 14:49:55 +01:00
David Kaltschmidt
648a775acb Explore: Fix datasource selector being empty with single datasource 
- The "missing" action was triggered unless the number of datasource >1 🤦
- Made datasource preselection more robust in case the requested datasource is already gone
 2019-01-17 12:07:42 +01:00
Johannes Schill
1dfabf498a chore: Replace the deprecated SFC with FC 2019-01-17 09:27:43 +01:00
David Kaltschmidt
9575a4a2c0 Move action properties to payload 2019-01-16 10:21:11 +01:00
David Kaltschmidt
6ff15039a9 File organization, action naming, comments 
- moved ActionTypes to `./state/actionTypes`
- renamed click-related actions
- added comments to actions and state types
- prefixed Explore actions with `explore/`
- fixed query override issue when row was added
 2019-01-15 20:04:05 +01:00
David Kaltschmidt
9aede9e636 Fix reducer issues 2019-01-15 20:04:03 +01:00
David Kaltschmidt
546a3a9d98 Connect Explore child components to store 2019-01-15 20:04:01 +01:00
David Kaltschmidt
607f7c25de Update comments 2019-01-15 20:03:59 +01:00
David Kaltschmidt
f02f41c9b0 Move types to types/explore 2019-01-15 20:03:57 +01:00
David Kaltschmidt
be172d3e4a Save state in URL and fix tests 2019-01-15 20:03:55 +01:00
David Kaltschmidt
68c039b289 Allow multiple Explore items for split 2019-01-15 20:03:53 +01:00
David Kaltschmidt
2be2deddb8 WIP Explore redux migration 2019-01-15 20:03:51 +01:00
Dominik Prokop
96be5fe8a3 Remove the jump effect on run query button 
Caused by the return and loading spinner icons having different widths. Used fa-fw helper class to ensure fixed width on icons. Also, made the spacing between icon and button label slightly smaller, as the rotated level-down icon used as return icon has significantly smaller width compared to the loading spinner and it looked oddly far from the label as compared to timepicker's icon
 2019-01-07 15:26:43 +01:00
Simon Podlipsky
c39dc1fb15 Some cleanup 2019-01-05 15:25:07 +01:00
David Kaltschmidt
757d6f322e s/initialDatasourceId/initialDatasource/ 2019-01-02 11:32:12 +00:00
David Kaltschmidt
67ebdcbcc3 Explore: Remember last use datasource 
- use local storage to store last used database
- renamed `datasourceName` property to `initialDatasourceId` for consistency
- adapted tests
 2018-12-31 18:30:32 +00:00
Torkel Ödegaard
66a13b281c Merge branch 'grafana-lib' 2018-12-25 19:26:46 +01:00
Torkel Ödegaard
a02b4b47b6 Moving a couple of types to @grafana/ui 2018-12-23 09:15:32 +01:00
David
b2401e37fa
Merge pull request #14414 from grafana/davkal/explore-logging-search 
Explore: Split logging query into selector and search
 2018-12-22 17:00:57 +01:00
Torkel Ödegaard
d0f8d034df Quick refactoring of time picker styles, needs a much bigger redesign 2018-12-19 13:13:46 +01:00
Torkel Ödegaard
6542bfb83e Merge branch 'fix-misspell-issues' of https://github.com/mjtrangoni/grafana into mjtrangoni-fix-misspell-issues 2018-12-19 11:21:34 +01:00
Erik Sundell
ad3d36e6b7 Make sure panel id is unique since some datasources (Graphite) will cancel ongoing requests with the same panel id 2018-12-18 09:44:51 +01:00
Erik Sundell
f673d60dae Merge branch 'develop' of https://github.com/grafana/grafana into develop 2018-12-17 11:17:58 +01:00
Erik Sundell
e84e6740e6 propagate initial state back to explore query runner 2018-12-17 11:17:16 +01:00
Torkel Ödegaard
72b9cb9b9f Switched to react-select fork 2018-12-16 09:58:37 +01:00
Torkel Ödegaard
b15bb4fb95 Merge remote-tracking branch 'origin/master' into develop 2018-12-14 17:02:08 +01:00
Torkel Ödegaard
ae76ddcc3b explore using data source picker 2018-12-14 14:05:47 +01:00
Torkel Ödegaard
24825dc899 renamed folder to select 2018-12-14 12:59:45 +01:00
Torkel Ödegaard
f9110f7902 Merge branch 'master' into develop 2018-12-11 10:00:29 +01:00
Torkel Ödegaard
0253792dad
Merge pull request #14438 from grafana/davkal/explore-enhanced-log-parsing 
Explore: Improved line parsing for logging
 2018-12-11 09:10:45 +01:00
David Kaltschmidt
71429d7210 Explore: Improved line parsing for logging 
- changed log parser API to be more semantic: getting fields, getting values
- regexps become an implementation detail of parser and are no longer part of the API
- improved JSON parser to not be tripped by nested quotation marks
- improved JSON parser to support numbers
- added more tests
 2018-12-10 10:05:57 -08:00
Torkel Ödegaard
6f061ab159
Merge pull request #14403 from grafana/logs-graph-stacking 
Fixed issue with logs graph and stacking
 2018-12-10 14:16:28 +01:00
Torkel Ödegaard
7e0bc8f30d fixed max height issue not being respected by react select dropdown 2018-12-10 12:02:27 +01:00
David Kaltschmidt
6b9200a606 Explore: Split logging query into selector and search 
- add second query field to logging datasource query component
- second field manages search term, first field manages stream selectors
- improved logging cheat sheet to get started
 2018-12-09 18:44:59 +01:00
Torkel Ödegaard
a9fc77b411
Merge pull request #14408 from grafana/davkal/fix-14407 
Explore: Hide scanning again after result was found
 2018-12-09 17:46:14 +01:00
Torkel Ödegaard
837a621502
Merge pull request #14410 from grafana/davkal/explore-logging-dedup-description 
Explore: Logging dedup tooltips
 2018-12-09 17:44:45 +01:00
David Kaltschmidt
61924e9130 Explore: dont pass all rows to all rows, fixes profiler 
- react profiler seems to evaluate all props of all components down the tree
- this becomes slow when 1000 rows are passed to 1000 rows and their labels
- use getter function instead to ask for rows on demand
 2018-12-09 13:23:44 +01:00
David Kaltschmidt
487de2b832 Explore: Logging dedup tooltips 
- use title attribute of toggle button group
- add descriptions for all dedup options
 2018-12-09 13:06:34 +01:00
David Kaltschmidt
1bcc866341 Explore: Hide scanning again after result was found 
- when query result was found, stop scanning
- this hides the scan status again
 2018-12-09 11:42:35 +01:00