Patrick O'Carroll
c34021344a
Merge branch 'master' into ui-new-red-green-blue
2019-02-11 09:17:19 +01:00
Marcus Efraimsson
5eea85a3a3
changelog: add notes about closing #8570
2019-02-11 09:06:20 +01:00
Marcus Efraimsson
75f89ecf1f
Merge pull request #14888 from bugficks/8570-mysql-ssl-datasource
...
MySQL SSL CA in datasource connector
2019-02-11 09:00:18 +01:00
Marcus Efraimsson
be11da5b31
update changelog
2019-02-11 08:49:10 +01:00
Marcus Efraimsson
06972144d2
changelog: add notes about closing #14233
2019-02-11 08:48:03 +01:00
Marcus Efraimsson
7b761f0a28
changelog: add notes about closing #15189
2019-02-11 08:44:04 +01:00
Marcus Efraimsson
41217ea110
changelog: add notes about closing #13324
2019-02-11 08:39:33 +01:00
Marcus Efraimsson
bd48408e2d
Merge pull request #15215 from thatsparesh/13324-mssql-pass-timerange-for-template-variable-queries
...
mssql: pass timerange for template variable queries
2019-02-11 08:36:47 +01:00
Torkel Ödegaard
9ab06c6eef
Merge pull request #15333 from nrichards/nrichards-patch-1
...
Improve usability of forms, better showing disabled metrics
2019-02-10 20:15:53 +01:00
Torkel Ödegaard
3e583707ca
Merge pull request #15335 from tcpatterson/cloudwatch-ec2-api-metrics
...
Add aws ec2 api metrics for cloudwatch
2019-02-10 20:15:12 +01:00
Torkel Ödegaard
295bc425ff
Merge pull request #15337 from grafana/time-range-to-angular-query-controllers
...
provide time range to angular query controllers
2019-02-10 20:02:41 +01:00
Torkel Ödegaard
a0729b9b50
provide time range to angular query controllers
2019-02-10 17:05:58 +01:00
thatsparesh
105879ab5d
use timeSrv in metricFindQuery as timeRange
2019-02-09 14:57:20 -06:00
thatsparesh
716db35fae
remove unnecessary spy
2019-02-09 14:56:43 -06:00
Connor Patterson
d2aed7e075
Fix formatting
2019-02-09 14:13:15 -05:00
Connor Patterson
2987a47a9b
Add aws ec2 api metrics for cloudwatch
2019-02-09 13:47:08 -05:00
Nick Richards
bd6cefa53f
Improve usability showing disabled lines in forms
...
* Use gray-3 instead of gray-2 for text-color-weak in "light" theme
2019-02-08 14:51:50 -08:00
Torkel Ödegaard
89c153d44b
Merge pull request #15332 from grafana/style-fixes
...
Fixed issues with plus button in threshold and panel option header
2019-02-08 22:21:03 +01:00
Torkel Ödegaard
2e050d3337
Merge pull request #15331 from ryantxu/color-parsing
...
support three letter hex color strings
2019-02-08 22:19:56 +01:00
Torkel Ödegaard
748cb44911
Fixed issues with plus button in threshold and panel option header, and current state in viz picker, fixes #15329
2019-02-08 21:53:51 +01:00
ryan
169732997d
support three letter hex color strings
2019-02-08 12:46:30 -08:00
Torkel Ödegaard
db8c74c4c3
Merge pull request #15323 from ryantxu/package-license
...
mark grafana-ui package with Apache license
2019-02-08 18:13:41 +01:00
Marcus Efraimsson
1bc2a0af70
use unique datasource id when registering mysql tls config
2019-02-08 18:08:07 +01:00
ryan
3d5ae3dca3
mark packages as Apache license
2019-02-08 08:10:02 -08:00
Torkel Ödegaard
3e317b7d20
Merge pull request #15235 from grafana/core/theming
...
POC - Enable js defined theme to be used in SASS
2019-02-08 16:10:17 +01:00
Torkel Ödegaard
5436c28448
Minor refactoring around theme access
2019-02-08 15:38:45 +01:00
Dominik Prokop
7e03913d0d
Use TS instead of JS to store theme variables@next
2019-02-08 14:06:53 +01:00
Dominik Prokop
71576a634e
Do not use js theme variables in sass (poor dev experience for now)
2019-02-08 14:06:06 +01:00
Torkel Ödegaard
bb8bec5aaa
Merge branch 'master' into core/theming
2019-02-08 09:05:41 +01:00
Leonard Gram
b32d420a75
ldap: refactoring.
2019-02-08 08:18:24 +01:00
Daniel Lee
21a1507c77
ldap: fixes #14432 . Fix for IPA v4.6.4
...
IPA v4.6.4 introduced a fix that does not allow empty attributes
to be sent in a search request. This fix only adds attributes to
the request if they are mapped in the ldap toml file.
2019-02-08 08:18:24 +01:00
Daniel Lee
13d9acb1ef
ldap: adds docker block for freeipa
2019-02-08 08:18:24 +01:00
Torkel Ödegaard
0bd39e5426
Merge pull request #15307 from grafana/fixed-explore-width-0
...
fixed explore width-0 issue
2019-02-07 19:11:02 +01:00
Torkel Ödegaard
df17f7dc45
fixed explore width-0 issue, fixes #15304
2019-02-07 18:20:16 +01:00
Marcus Efraimsson
c71904e326
Merge pull request #15239 from grafana/auth_token_middleware_refactor
...
Auth token package and middleware refactoring
2019-02-07 14:24:23 +01:00
Torkel Ödegaard
78ea7ae783
Merge pull request #15212 from grafana/dashboard-react-page
...
Dashboard react page
2019-02-07 14:23:44 +01:00
Dominik Prokop
ac50d2b31f
Merge branch 'master' into core/theming
2019-02-07 14:20:53 +01:00
Marcus Efraimsson
b545f51820
changelog: add notes about closing #15291
2019-02-07 14:18:20 +01:00
Torkel Ödegaard
8f0e9b674d
Merge pull request #15282 from CorpGlory/unexpected-semver-comparison-behavior-#15280
...
Unexpected semver comparison behavior #15280
2019-02-07 14:17:48 +01:00
Dominik Prokop
e7917ce4e0
Removed unnecessary code from ColorPicker and extended theme type
2019-02-07 14:10:56 +01:00
Dominik Prokop
5ba3b0aa2c
Selecting theme variable variant helper function
2019-02-07 14:10:20 +01:00
Torkel Ödegaard
00a676ff86
Merge pull request #15292 from mtanda/template_json_format
...
support json format templating
2019-02-07 14:05:09 +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
Torkel Ödegaard
2eca4caa5d
added reducers tests
2019-02-07 13:58:24 +01:00
Mitsuhiro Tanda
89d69a6f21
update docs
2019-02-07 20:16:20 +09:00
Torkel Ödegaard
61e9148eed
added way to test action called from react component
2019-02-07 12:02:01 +01:00
Torkel Ödegaard
5f808ddf22
Added annother initDashboard test
2019-02-07 11:17:31 +01:00
bergquist
487e7b5ea6
removes cleanup setting from docs
2019-02-07 11:07:55 +01:00
bergquist
170783c292
make hourly cleanup the default behavior
2019-02-07 10:51:35 +01:00
Torkel Ödegaard
8b080f0511
Simplified condition
2019-02-07 09:09:59 +01:00
