public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,884 Commits 655 Branches 650 Tags
29fcc463336f7f0e00e94de6fe1cc6350c4eb0da
Commit Graph
38884 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Bergquist 396a5a947f Merge pull request #15300 from bergquist/token_usage_stats 
adds usage stats for sessions
 2019-02-11 10:31:57 +01:00
Torkel Ödegaard a402a3713f Merge pull request #15339 from grafana/navbar-back-btn 
Navbar back btn
 2019-02-11 10:28:47 +01:00
ijin08 2a2b242eb0 removed extra semi-colon 2019-02-11 10:27:58 +01:00
Torkel Ödegaard e75e69a709 Commented out the Loki dashboard query editor 2019-02-11 10:27:04 +01:00
ijin08 1cff59731c added old green to dark-theme 2019-02-11 10:25:33 +01:00
Torkel Ödegaard 3bf0a5ffc6 Fixed issue with logs graph not showing level names 2019-02-11 10:01:43 +01:00
ijin08 9e0c795228 set secondary to new blue 2019-02-11 09:54:14 +01:00
Torkel Ödegaard 58e57a1669 removed unused directive 2019-02-11 09:46:56 +01:00
Torkel Ödegaard 9565e48f03 Fixed issue where double clicking on back button closes sidemenu 2019-02-11 09:37:13 +01:00
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
Daniel Lee d6904ba9b4 azuremonitor: small refactoring 2019-02-11 01:22:15 +01:00
Daniel Lee 60327953a2 azuremonitor: handles timegrain set to auto on backend 2019-02-11 01:17:37 +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 f38e64cc5d Navbar back button, no title edit this time 2019-02-10 20:01:22 +01:00
Torkel Ödegaard a0729b9b50 provide time range to angular query controllers 2019-02-10 17:05:58 +01:00
Daniel Lee 452c4f5b9b azuremonitor: add test for dimension filter 2019-02-10 01:47:38 +01:00
Daniel Lee b94de101cd azuremonitor: refactor azure monitor api code into own file 2019-02-10 01:18:16 +01:00
Daniel Lee b816f35c41 azuremonitor: handle multi-dimensions on backend 2019-02-10 00:23:12 +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
Daniel Lee a5e5db20e1 azuremonitor: add support for aggregations on backend 2019-02-09 21:52:44 +01: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
Daniel Lee 10194df112 azuremonitor: simple alerting for Azure Monitor API 
Lots of edge cases and functionality left to implement but
a simple query works for alerting now.
 2019-02-08 18:15:17 +01: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
Daniel Lee 0e228d582d azuremonitor: builds a query and sends it to Azure on the backend 
Lots of edge cases not covered and the response is not parsed. It only
handles one service and will have to be refactored to handle multiple
 2019-02-08 17:20:31 +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
Dominik Prokop 512aa62efc Update config mock in metrics panel controller test 2019-02-08 11:50:05 +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