IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-30 12:44:10 -06:00
Code Issues Packages Projects Releases Wiki Activity
16,991 Commits 5,113 Branches 538 Tags 1.9 GiB
0b490912bd
Commit Graph

7360 Commits

Author SHA1 Message Date
Torkel Ödegaard
0b490912bd
Merge pull request #13716 from grafana/davkal/13613-fix-split-layout 
Explore: fix render issues in split view
 2018-10-18 13:00:23 +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
David Kaltschmidt
a1410b54a5 Explore: fix render issues in split view 
- avoid line wrap in row tools (add/remove/clear)
- avoid text overflow in query field
 2018-10-17 17:59:03 +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
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
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
Marcus Efraimsson
cf93b1e700
Merge pull request #13708 from svenklemm/interpolateVariable 
postgres: fix template variables error
 2018-10-17 13:42:47 +02:00
Marcus Efraimsson
7b656097a7
postgres: use arrow function declaration of interpolateVariable 2018-10-17 13:30:07 +02:00
Sven Klemm
ec0fd96f08 Use closure for calling interpolateVariable 2018-10-17 12:30:07 +02:00
Marcus Efraimsson
62f21a254a
Merge pull request #12337 from mtanda/cw_regions 
show all CloudWatch regions (avoid hard coding)
 2018-10-17 11:55:43 +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
Mitsuhiro Tanda
c64a5a6e0e re-add hard coded region list 2018-10-17 14:02:02 +09:00
Dave Waters
e9b8051724 Merge branch 'master' of http://github.com/grafana/grafana into add-notification-channel-option-to-disable-resolved-alert 2018-10-16 17:43:26 -04:00
Marcus Efraimsson
3612a1c00e
Merge pull request #13678 from ramiro/add-encrypt-mssql-ds-option 
Add encrypt setting to MSSQL data source.
 2018-10-16 19:07:00 +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
Johannes Schill
2a82b57d93 Remove unwanted char 2018-10-16 08:11:26 +02:00
Johannes Schill
6d3f037ef1 Fix incorrect alt text on logo 2018-10-16 07:50:44 +02:00
Mitsuhiro Tanda
fce50cf1b8 return default region list from backend 2018-10-16 12:20:39 +09:00
Mitsuhiro Tanda
a417d6fa21 don't merge hard coded region list 2018-10-16 12:03:33 +09:00
Mitsuhiro Tanda
61e2710961 add error message 2018-10-16 12:03:33 +09:00
Mitsuhiro Tanda
6564abd5f3 get regions from after datasource save 2018-10-16 12:03:33 +09:00
Mitsuhiro Tanda
f6cb01d38a show all CloudWatch regions 2018-10-16 12:03:33 +09:00
Ramiro Morales
90de703ef2 fix new setting default value handling. 2018-10-15 21:41:00 -03:00
Ramiro Morales
d859a6aeb8 rename new JSON data attrbute. 2018-10-15 20:34:03 -03: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
Ramiro Morales
37f16ca80a Add 'encrypt' setting to MSSQL data source. 
Fixes #13629
 2018-10-15 14:47:54 -03: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
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
Torkel Ödegaard
40e3758698
Merge pull request #13662 from franciscocpg/adding-time-clock 
Adding time clock
 2018-10-14 10:19:39 +02:00
Torkel Ödegaard
37548792f5
Merge pull request #13659 from grafana/graph-time-format-fix 
fix for graph time formating for Last 24h ranges
 2018-10-14 10:16:37 +02:00
Francisco Guimarães
b4bca473db Adding tests 2018-10-13 09:32:21 -03:00
Francisco Guimarães
3db5d14214 Adding time clockms and clocks 2018-10-13 09:03:16 -03:00
Torkel Ödegaard
551e0843fa fix for graph time formating for Last 24h ranges, fixes #13650 2018-10-12 21:51:21 -07:00
olshansky
91e201ffa8 fix: label values regex for single letter labels 
Closes: #13641
 2018-10-12 23:13:11 +03:00
Marcus Efraimsson
4b1a2d3b11
make sure to add all variable nodes to dag before linking variables 2018-10-12 14:15:44 +02:00
Daniel Lee
09c9c2a57b
Merge pull request #13624 from grafana/filter-option-fix 
Stackdriver: Prevent filter from crashing
 2018-10-12 13:36:41 +02:00
Peter Holmberg
c9721bf8cc fix route issue 2018-10-12 08:54:37 +02:00
Torkel Ödegaard
c1fd4265a9 renamed extension point in the frontend 2018-10-12 07:19:05 +02:00
Torkel Ödegaard
4aa7dc0c85 minor change to cloudwatch code formatting 2018-10-11 12:58:17 -07:00
Torkel Ödegaard
caf995bb94 Merge branch 'update-cloudwatch-extended-stats-check' of https://github.com/apalaniuk/grafana into apalaniuk-update-cloudwatch-extended-stats-check 2018-10-11 12:55:09 -07:00
Torkel Ödegaard
69e0311cbc Merge branch '13425-team-picker-bug' 2018-10-11 12:52:48 -07:00