IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
17,233 Commits 5,416 Branches 554 Tags
bf1af66292ca27df3d9ddf278ec9f12051f12a59
Commit Graph

6900 Commits

Author SHA1 Message Date
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
Torkel Ödegaard
ae7a1bc139 Can render graph 2018-10-15 21:52:24 +02:00
Ramiro Morales
37f16ca80a Add 'encrypt' setting to MSSQL data source. 
Fixes #13629
 2018-10-15 14:47:54 -03:00
Sven Klemm
20c1a58488 Escape typeahead values in query_part 2018-10-15 14:05:07 +02:00
Sven Klemm
3a25a0de83 Escape values in metric segment and sql part 2018-10-15 13:53:37 +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
9adad76f52 wip: began first steps for a react graph component 2018-10-14 22:24:18 +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
631af46c48 Merge branch 'master' into react-panels-step1 2018-10-14 10:44:38 +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
Torkel Ödegaard
8ba865bf57 Merge branch 'master' into react-panels-step1 2018-10-12 13:31:20 +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
Adam Palaniuk
58a156ba03 Update check for invalid percentile statistics 2018-10-11 14:00:34 -05: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
Erik Sundell
c84cf1f598 stackdriver: check if array is empty to prevent filter from crashing. This closes #13607 2018-10-11 15:10:47 +02:00
Johannes Schill
7689e9bbf2 Handle DescriptionPicker's initial state #13425 2018-10-11 15:06:51 +02:00