IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
17,678 Commits 5,454 Branches 554 Tags 1.9 GiB
159c5cdb63
Commit Graph

3226 Commits

Author SHA1 Message Date
Peter Holmberg
f95b80b7e1 remove this 2018-11-01 14:01:06 +01:00
Peter Holmberg
f15ed848f9 Merge branch 'master' into data-source-settings-to-react 2018-11-01 13:52:53 +01:00
Peter Holmberg
6493f96ac7 updated snap 2018-11-01 13:47:40 +01:00
Peter Holmberg
2837fd515f tests 2018-11-01 13:45:52 +01:00
Peter Holmberg
7fc4b1934b updating state and save 2018-11-01 11:19:40 +01:00
Torkel Ödegaard
ee5b37eb2c
Merge pull request #13878 from grafana/org-page-to-react 
Org page to react
 2018-10-31 20:39:56 +01:00
Torkel Ödegaard
d8e257e633 fixed react whitespace warning on teams page 2018-10-31 12:39:02 -07:00
Torkel Ödegaard
d64edc4a29 renamed org files to match new naming guide 2018-10-31 12:28:26 -07:00
Torkel Ödegaard
dcf8327dc9 moved profile pages to it's own feature folder 2018-10-31 12:25:46 -07:00
Torkel Ödegaard
17386c49d4 moved new teams page 2018-10-31 12:21:16 -07:00
Torkel Ödegaard
99d0beeaa9 reload page after preferences update 2018-10-31 12:18:19 -07:00
Torkel Ödegaard
7885453bcd listen for changes in angular land and propagate that back to react 2018-10-31 09:19:08 -07:00
Peter Holmberg
2342f60a31 added actions 2018-10-31 14:28:16 +01:00
Peter Holmberg
1656f03acd cleaned up render 2018-10-31 13:29:02 +01:00
Peter Holmberg
5140325a0d renders angular component 2018-10-31 13:23:05 +01:00
Torkel Ödegaard
32ca8b7aad updated api keys snapshot 2018-10-31 12:54:30 +01:00
Torkel Ödegaard
05dee9e340 Merge branch 'mondras-empty-cta-apikeys' 2018-10-31 12:51:36 +01:00
Torkel Ödegaard
95a8a59845 restored transition 2018-10-31 12:50:44 +01:00
Torkel Ödegaard
dfb9419f86 Merge branch 'graph-legend-to-react' 2018-10-31 04:26:44 -07:00
Torkel Ödegaard
36cd73819a fixed memory leaks and minor refactoring 2018-10-31 03:40:03 -07:00
David Kaltschmidt
037167ff07 Fix TimePicker test by enforcing UTC on date string 2018-10-30 16:50:03 +01:00
Peter Holmberg
a7bd944098 updated view to use angular loader 2018-10-30 16:40:08 +01:00
David Kaltschmidt
c92f5462fe Explore: repair logging after code restructuring 
this is a fix-up PR that cleans up Explore Logging after the recent
restructuring.

- log results need to be merged since query transactions have been
  introduced
- logging DS has its own language provider, query field, and start page
  (some of them based on prometheus components)
- added loader animation to log viewer
- removed logging logic from prometheus components
 2018-10-30 16:35:49 +01:00
David
758ec4bc70
Merge pull request #13844 from grafana/davkal/explore-empty-page 
Explore: Pluggable components from datasource plugins
 2018-10-30 14:54:34 +01:00
David Kaltschmidt
cf19ecc8f5 Make Explore plugin exports explicit 2018-10-30 14:38:34 +01:00
Peter Holmberg
58e94fc0fa moved state 2018-10-30 13:09:59 +01:00
David Kaltschmidt
5a23723f2c Explore: fix copy/paste on table cells 
When selecting text via mouse, our ReactTable cells' click handler
triggers an event.

- check event target to be the link, only then handle the event
 2018-10-29 16:44:50 +01:00
Peter Holmberg
12a63b605f rename type 2018-10-29 16:01:14 +01:00
Peter Holmberg
12336e1548 using label component 2018-10-29 15:59:16 +01:00
David Kaltschmidt
d0776937b5 Pluggable components from datasource plugins 
- when instantiating a datasource, the datasource service checks if the
  plugin module exports Explore components, and if so, attaches them to
  the datasource
- Explore component makes all major internal pluggable from a datasource
  `exploreComponents` property
- Moved Prometheus query field to promehteus datasource and registered
  it as an exported Explore component
- Added new Start page for Explore, also exported from the datasource
 2018-10-29 15:14:36 +01:00
Peter Holmberg
70f6100d53 fixed type 2018-10-29 15:08:36 +01:00
David
b00e709aee
Merge pull request #13842 from grafana/davkal/explore-error-handling 
Explore: error handling and time fixes
 2018-10-29 15:08:14 +01:00
Peter Holmberg
7c5e04277c Merge branch 'master' into org-page-to-react 2018-10-29 14:26:11 +01:00
Peter Holmberg
7dc5173a9b removed angular code 2018-10-29 14:21:11 +01:00
Peter Holmberg
026588cbf1 test and some refactoring 2018-10-29 13:46:12 +01:00
Torkel Ödegaard
1a65046b64 Merge branch 'empty-cta-apikeys' of https://github.com/mondras/grafana into mondras-empty-cta-apikeys 2018-10-29 09:52:27 +01:00
Torkel Ödegaard
5dd9247762 Merge branch 'master' into panel-edit-ux 2018-10-28 12:11:47 -07:00
Torkel Ödegaard
9f1f5805ec added switch form component 2018-10-28 12:10:49 -07:00
David
2ec827f02f
Merge pull request #13774 from miqh/feat/sum-query-suggestion 
Implement sum aggregation suggestion with placeholder support
 2018-10-28 17:37:42 +01:00
Michael Huynh
d1d5e9f7d3
Add tests to cover PlaceholdersBuffer and sum hint 
Related: #13615
 2018-10-28 21:07:40 +08:00
Michael Huynh
c255b5da11
Add sum aggregation query suggestion 
Implements rudimentary support for placeholder values inside a string
with the `PlaceholdersBuffer` class. The latter helps the newly added
sum aggregation query suggestion to automatically focus on the label
so users can easily choose from the available typeahead options.

Related: #13615
 2018-10-28 21:03:39 +08:00
Torkel Ödegaard
3da62f1083 Merge branch 'master' into panel-edit-ux 2018-10-27 17:44:04 +02:00
Torkel Ödegaard
c5f9d8092f Reduce re-renderings when changing view modes 2018-10-27 16:54:04 +02:00
Torkel Ödegaard
b1b534a005 more ux progress 2018-10-27 15:09:36 +02:00
Torkel Ödegaard
a4674ecaa1 panel edit mode changes 2018-10-27 10:14:38 +02:00
David Kaltschmidt
bf1af66292 Explore: error handling and time fixes 
- use global range types
- add ErrorBoundary around individual Explore components
- fix table merge on empty results
- fix TimePicker date parsing on ISO dates
- fix TimePicker range string after relative move
 2018-10-26 18:16:00 +02:00
Torkel Ödegaard
bcf669fab5 ux experiments 2018-10-26 16:29:08 +02:00
Peter Holmberg
ccbff592d2 adding default value and update actions 2018-10-26 14:51:33 +02:00
Peter Holmberg
affb04a3ce moved state to redux, renamed entities 2018-10-26 14:15:37 +02:00
Torkel Ödegaard
94c35e2577 testing panel edit ux idea 2018-10-26 13:20:10 +02:00
David
239dfbc9ae
Merge pull request #13824 from grafana/davkal/explore-plugins 
Explore: move suggestions logic to datasource language provider
 2018-10-26 11:40:52 +02:00
Torkel Ödegaard
e7f6cdc625 Merge branch '13739/alert-to-react' 2018-10-25 17:44:23 +02:00
Torkel Ödegaard
f1660aa21a fix: updated backend srv to use appEvents and removed parts of alertsSrv 2018-10-25 17:05:17 +02:00
Peter Holmberg
a98f7e548f simple select 2018-10-25 16:56:49 +02:00
David Kaltschmidt
6f2315d5c5 Moved prom language features to datasource language provider 2018-10-25 12:24:24 +02:00
Torkel Ödegaard
be6f68f341 fix for annotation promise clearing, bug introduced last week when merging react panels step1 2018-10-25 11:35:32 +02:00
Peter Holmberg
1f8b61f9a6 load preferences 2018-10-25 07:45:22 +02:00
Peter Holmberg
596a83407e fixed routes and page 2018-10-24 16:17:25 +02:00
David Kaltschmidt
54a3e2d1d1 Added types to query rows 2018-10-24 14:55:56 +02:00
Peter Holmberg
8c742a9530 Merge branch 'master' into data-source-settings-to-react 2018-10-24 14:50:33 +02:00
Johannes Schill
b880f8d548 Update the regex-matching in templateSrv to work with the new variable-syntax and be more flexible to regex-changes #13804 2018-10-24 13:29:03 +02:00
David
a6fc74e35b
Merge pull request #13803 from grafana/davkal/explore-fix-resize 
Explore: fix graph resize on window resize
 2018-10-24 12:32:27 +02:00
Johannes Schill
38c155403e Move the variable regex to constants to make sure we use the same reg… (#13801) 2018-10-24 12:06:09 +02:00
David
8f7686c5a7
Merge pull request #13773 from miqh/fix/click-typeahead-suggestion 
Fix click-based selection of typeahead suggestion
 2018-10-24 11:42:58 +02:00
David Kaltschmidt
d6ff16fe72 Explore: fix graph resize on window resize 
- resize HOC wrapper only resized first child which in case of large
  graphs was the warning button
- moved warning button inside the panel parent
 2018-10-24 11:30:32 +02:00
David Kaltschmidt
a121cd0e49 Fix race condition on add/remove query row 2018-10-24 11:08:15 +02:00
David Kaltschmidt
f19ffee5b4 Fix rebase, fix empty field still issuing query problem 2018-10-23 17:21:33 +02:00
David Kaltschmidt
0cd89e80ca Submit query when enabling result viewer 2018-10-23 16:13:23 +02:00
David Kaltschmidt
fbed57ab43 Get query hints per query transaction 2018-10-23 16:10:52 +02:00
David Kaltschmidt
2e02a8c855 Explore: query transactions 
Existing querying was grouped together before handed over to the
datasource. This slowed down result display to however long the slowest
query took.

- create one query transaction per result viewer (graph, table, etc.)
  and query row
- track latencies for each transaction
- show results as soon as they are being received
- loading indicator on graph and query button to indicate that queries
  are still running and that results are incomplete
- properly discard transactions when removing or changing queries
 2018-10-23 16:09:48 +02:00
David
e761fb1936
Merge pull request #13761 from grafana/davkal/explore-reuse-table-merge 
Explore: reuse table merge from table panel
 2018-10-23 16:00:57 +02:00
Peter Holmberg
bb6409384e connected to store, self remove logic 2018-10-23 16:00:04 +02:00
Torkel Ödegaard
2107f88fc1
Merge pull request #13770 from ceh-forks/editor-duplicate-placeholder 
ux: remove duplicate placeholder attribute
 2018-10-23 15:52:33 +02:00
Johannes Schill
22a0f3cf94 fix: Text box variables with empty values should not be considered fa… (#13791) 
* fix: text box template variable doesn't work properly without a default value
 2018-10-23 14:05:10 +02:00
Peter Holmberg
c92813f313 Merge branch 'master' into data-source-settings-to-react 2018-10-22 14:49:41 +02:00
Torkel Ödegaard
16a2b207cc fix: DataPanel isFirstLoad state fix 2018-10-22 09:54:43 +02:00
Michael Huynh
3bb0b0a551
Fix click-based selection of typeahead suggestion 
In short, the underlying problem appears to be the `onChange()` handler
being triggered after handling the blur event. Since the contents have
not actually changed this forces the typeahead state to reset which
undesirably puts a stop to propagating the selected suggestion back up
to get set.

Related: #13604
 2018-10-21 12:51:21 +08:00
Emil Hessman
30baaa48fe ux: remove duplicate placeholder attribute 2018-10-20 15:08:38 +02:00
David Kaltschmidt
374fe9dcb4 Explore: reuse table merge from table panel 
- Extracted table panel's merge logic to combine multiple tables into one
- Put the merge logic into the table model as it merges multiple table
  models
- make use of merge in Explore's table query response handler
- copied tests over to table model spec, kept essential tests in
  transformer spec
 2018-10-19 15:29:58 +02:00
Torkel Ödegaard
b95d64e7a0 fix: fixed variable srv tests 2018-10-19 11:14:02 +02:00
Torkel Ödegaard
936fe56080 fix: another set of fixes for refresh 2018-10-19 10:05:48 +02:00
Torkel Ödegaard
11f66bb909 fixed issue with template refresh 2018-10-19 09:43:54 +02:00
Torkel Ödegaard
dddbe62d6c Merge branch 'master' into react-panels-step1 2018-10-19 09:15:37 +02:00
Torkel Ödegaard
5c95a01229 Merge branch 'master' of github.com:grafana/grafana 2018-10-18 14:38:43 +02:00
David
bf1a0585ed
Merge pull request #13712 from grafana/davkal/explore-react-table 
Explore: Use react-table as table component
 2018-10-18 12:44:56 +02:00
David Kaltschmidt
9e647590ac Review feedback, increased height 2018-10-18 10:42:25 +02:00
Peter Holmberg
ab2be340f7 remove not used file 2018-10-18 09:34:51 +02:00
Peter Holmberg
02769b6d3c Merge branch 'master' into datasource-dashboards-to-react 2018-10-18 08:34:31 +02:00
David
1d60c45a04
Merge pull request #13663 from miqh/fix/label-value-suggestions 
Fix typeahead behaviour for QueryField
 2018-10-17 16:56:02 +02:00
Marcus Efraimsson
da89c27caf
Merge pull request #13702 from grafana/data-source-instance-to-react 
Support Data source permissions
 2018-10-17 16:54:57 +02:00
Peter Holmberg
84bbfe11ca tests 2018-10-17 16:14:45 +02:00
Michael Huynh
22e0ff8b9c Update PromQueryField tests to address fixed bug 
Related: #13484
 2018-10-17 22:09:21 +08:00
Michael Huynh
a8c5ab76b3
Fix typeahead behaviour for QueryField 
These changes were originally intended to address a bug whereby a
suggestion for an already selected label value continues to appear.
However, they also appear to fix several other problems in the area:

- Wrong suggestions when using negated label matching operators
- Misaligned label value suggestion replacements

Related: #13484
 2018-10-17 22:09:03 +08:00
Peter Holmberg
c2c3e15022 hooked up actions 2018-10-17 15:56:34 +02:00
David Kaltschmidt
ff67213b42 Explore: Use react-table as table component 
- adds react-table as dependency
- replaces custom table component in Explore
- vendors react-table styles and overrides them (currently in
  explore.scss)
 2018-10-17 14:58:04 +02:00
Peter Holmberg
f25a843a2c created view 2018-10-17 14:36:18 +02:00
Peter Holmberg
b7b0ce0107 remove addpermissions component 2018-10-17 11:07:17 +02:00
bergquist
70385119bc removes d in disableResolvedMessage 2018-10-17 10:41:18 +02:00
Peter Holmberg
dd2fb7961f removed snaps 2018-10-17 10:37:56 +02:00
Peter Holmberg
776f9aa288 Merge remote-tracking branch 'origin/data-source-instance-to-react' into permissions-code-to-enterprise 2018-10-17 10:00:18 +02:00
Peter Holmberg
66311a065c removing datasource permissions states from grafana 2018-10-16 15:36:33 +02:00
Dave Waters
18c73631ea rename UI Option, align with control, update tests 2018-10-16 07:12:32 -04:00
Peter Holmberg
ee0cc9bd77 Merge branch 'master' into data-source-instance-to-react 2018-10-16 12:14:11 +02:00
Peter Holmberg
ef0def2277 Merge branch 'master' into permissions-code-to-enterprise 2018-10-16 11:09:58 +02:00
Peter Holmberg
8ef705f2b5 pausing for now 2018-10-16 09:59:03 +02:00
Dave Waters
6376154b16 add channel option to disable the resolved alert (OK Message) that is sent when condition returns to normal. 2018-10-15 17:16:14 -04:00
Torkel Ödegaard
ae7a1bc139 Can render graph 2018-10-15 21:52:24 +02:00
Peter Holmberg
7c3d101253 rendering settings 2018-10-15 16:45:39 +02:00
Marcus Efraimsson
9f85a7494a
Merge pull request #13651 from grafana/13628_fix_dag 
Make sure to add all variable nodes to directed acyclic graph (dag) before linking variables
 2018-10-15 11:42:59 +02:00
Torkel Ödegaard
a28c25a2e0 progress on react time series infra 2018-10-15 08:22:20 +02:00
Torkel Ödegaard
2fb721d3c6 various fixes to to queries tab (in react mode) 2018-10-14 21:14:11 +02:00
Torkel Ödegaard
8e85295b2b react panels query processing 2018-10-14 18:19:49 +02:00
Torkel Ödegaard
543c67a297 react panels: got data 2018-10-14 16:31:20 +02:00
Torkel Ödegaard
cd4619dad1 working on react data / query exectution 2018-10-14 15:39:34 +02:00
Torkel Ödegaard
2e1d45a875 changed DataPanel from HOC to use render props 2018-10-14 12:41:09 +02:00
Torkel Ödegaard
0662b5f962 fixing unit tests 2018-10-14 11:13:04 +02:00
Torkel Ödegaard
a029492d91
Merge pull request #13355 from jsferrei/jsferrei/fix-annotation-render-issue 
Fix graph render blocked by annotations issue
 2018-10-14 10:35:16 +02:00
Peter Holmberg
e642fce4a5 created component for http settings 2018-10-12 16:16:06 +02:00
Marcus Efraimsson
4b1a2d3b11
make sure to add all variable nodes to dag before linking variables 2018-10-12 14:15:44 +02:00
Torkel Ödegaard
8ba865bf57 Merge branch 'master' into react-panels-step1 2018-10-12 13:31:20 +02:00
Peter Holmberg
c5946ebd27 Merge branch 'data-source-instance-to-react' into data-source-settings-to-react 2018-10-12 09:20:43 +02:00
Peter Holmberg
c9721bf8cc fix route issue 2018-10-12 08:54:37 +02:00
Torkel Ödegaard
69e0311cbc Merge branch '13425-team-picker-bug' 2018-10-11 12:52:48 -07:00
Peter Holmberg
6a35eda862 removed unsused function 2018-10-11 15:55:33 +02:00
Peter Holmberg
8ab2d8b0b9 fix mutability bug, removed unused constructor 2018-10-11 15:32:13 +02:00
Johannes Schill
2787284033 Update snapshots after merge 2018-10-11 14:01:13 +02:00
Johannes Schill
dc9e822cc7 Remove CTA when CTA-action is clicked instead of a /new route #13471 2018-10-11 13:52:09 +02:00
Carlos Mondragon
b121700103 Add fancy delete button for ApiKeys. 2018-10-11 13:50:54 +02:00
Carlos Mondragon
5f5840b24c Add form to both the CTA page and the regular list. 2018-10-11 13:50:53 +02:00
Carlos Mondragon
af985743d2 Updated tests for new protip. 2018-10-11 13:50:53 +02:00
Carlos Mondragon
081cb7a695 Updated protip, not sure what to write there. 2018-10-11 13:50:53 +02:00
Carlos Mondragon
f03fa364df Update tests for ApiKeys CTA screen. 2018-10-11 13:50:53 +02:00
Carlos Mondragon
d2573a6bc8 Show CTA if there are no ApiKeys, otherwise show table. 2018-10-11 13:48:15 +02:00
Carlos Mondragon
0bf2d5ebcd Extract ApiKeyCount from state. 2018-10-11 13:31:52 +02:00
Peter Holmberg
02e7d713a1 Added Loading state on org pages 2018-10-11 11:49:34 +02:00
Torkel Ödegaard
39b25e0596
Merge pull request #13536 from grafana/davkal/explore-text-match 
Explore: highlight typed text in suggestions
 2018-10-10 18:50:14 +02:00
Peter Holmberg
037e9ad0bd tests 2018-10-10 17:04:48 +02:00
David Kaltschmidt
dcee0771ad Initialize Explore datasource correctly 2018-10-10 14:55:41 +02:00
Johannes Schill
ffae3e7a58 Rename css class "gf-form-select2" to "gf-form-select-box" #13425 2018-10-10 14:15:28 +02:00
Johannes Schill
be7ed3ebca Upgrade Datasources-picker on Explore page #13425 2018-10-10 14:15:26 +02:00
Johannes Schill
2d65845bac Update (js-) tests and snapshots for react-select 2 #13425 2018-10-10 14:15:25 +02:00
Johannes Schill
7e7c7fe64c Remove variables not used #13425 2018-10-10 14:15:25 +02:00
Johannes Schill
d9434ba1b1 wip: Upgrade react-select #13425 2018-10-10 14:15:25 +02:00
Peter Holmberg
8583788119 disable permissions 2018-10-10 13:50:42 +02:00
Peter Holmberg
83480a1de6 fixing weird arrow in select 2018-10-10 13:28:48 +02:00
Peter Holmberg
f150f35112 fixing permission rows 2018-10-10 11:22:08 +02:00
Peter Holmberg
8ed5594dbc enable permissions for data source 2018-10-10 10:39:48 +02:00
Torkel Ödegaard
ee1d4ce0e2 fix tab switching 2018-10-10 09:26:17 +02:00
praveensastry
1093f9da7e refactoring after review comments 2018-10-10 09:57:37 +11:00
Torkel Ödegaard
d2bdf8cff1 wip: fixed issues now things are starting to work as before for angular panels 2018-10-09 17:07:13 +02:00