IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-14 17:43:35 -06:00
Code Issues Packages Projects Releases Wiki Activity
8,448 Commits 5,447 Branches 554 Tags 1.9 GiB
8e89173095
Commit Graph

8448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mitsuhiro Tanda
1264a1b3a6 (cloudwatch) add metrics/dimensions (#6020) 2016-09-13 09:08:33 +02:00
Jouni Kuusisto
e53b815956 Enable "With Credentials" for InfluxDB datasource (#6018) 2016-09-13 08:57:39 +02:00
Carl Bergquist
52dc2db769 Merge pull request #6008 from rubycut/patch-1 
Increase datasource limit to 1000 #3910
 2016-09-13 08:38:07 +02:00
bergquist
3ba3d9d445 docs(changelog): add note about closing #2839 2016-09-13 08:14:43 +02:00
bergquist
f7abf01efb Merge branch 'mtanda-template_sort' 2016-09-13 08:12:23 +02:00
bergquist
03fb152d4b tech(templates): extract sort method 2016-09-13 08:11:04 +02:00
bergquist
9c5436c648 feat(templating): set default sort order 2016-09-13 07:39:30 +02:00
bergquist
e348822190 Merge branch 'template_sort' of https://github.com/mtanda/grafana into mtanda-template_sort 2016-09-13 07:16:34 +02:00
Carl Bergquist
1c7b76cb43 Merge pull request #6013 from mtanda/cloudwatch_kinesis_analytics 
(cloudwatch) add metrics/dimensions
 2016-09-12 17:03:25 +02:00
Mitsuhiro Tanda
f998b86ade (cloudwatch) add metrics/dimensions 2016-09-12 23:47:31 +09:00
bergquist
157ab1ba36 fix(setting): broken code 2016-09-12 14:57:37 +02:00
bergquist
811b7188c4 docs(config): add docs for how to run grafana behind a reverse proxy 2016-09-12 14:47:21 +02:00
bergquist
d7bf70a77b tech(tsdb): remove skip ssl setting. should be based on datasource settings 2016-09-12 13:37:00 +02:00
bergquist
6c5860d3e8 feat(metrics): measure proxy requests 2016-09-12 13:29:31 +02:00
Rubycut
501f89e829 Increase datasource limit to 1000 #3910 2016-09-12 10:45:17 +02:00
bergquist
eb673fd16d fix(middleware): typo 2016-09-12 10:11:55 +02:00
Torkel Ödegaard
014b70ded9 fix(graph): fixed showing rendering error in inspector, fixes #5995 2016-09-10 12:00:33 +02:00
Torkel Ödegaard
7aab4a4a59 fix(table): fixed issue with using mixed data source in table panel, fixes #5999 2016-09-10 09:57:25 +02:00
Chen Chenglong
7b1c374f64 support connect ldap server with starttls (#5969) 
* support connect ldap server with starttls

* add more doc for start_tls option
 2016-09-10 09:40:56 +02:00
bergquist
4edb31723c fix(metrics): ignore datasource proxy requests 2016-09-09 13:53:50 +02:00
bergquist
e7b56c6389 tech(metrics): move all request counters into one middleware 2016-09-09 13:28:19 +02:00
Torkel Ödegaard
4a2f2fba73 feat(alerting): show panel specific alert annotations, #5694 2016-09-09 11:30:55 +02:00
bergquist
583790e650 fix(alering): the crocdile turned on me > < 
closes #5855
 2016-09-09 07:42:07 +02:00
Carl Bergquist
51d2534f6a Merge pull request #5994 from mtanda/prometheus_fix_legend_template 
(prometheus) fix template variable expansion in legend
 2016-09-08 18:37:27 +02:00
Mitsuhiro Tanda
9d09e5bbd0 (prometheus) fix template variable expansion in legend 2016-09-09 00:46:04 +09:00
bergquist
aa80b52c07 feat(alerting): make it possible to skip ssl verification for alerting https requests 2016-09-08 16:29:31 +02:00
bergquist
7b9099ef93 fix(query): requires all that all series are empty to set NoDataFound 2016-09-08 14:33:10 +02:00
Torkel Ödegaard
0ac4ece00d feat(annotations): refactoring annotations srv to typescript, #5990 2016-09-08 14:31:30 +02:00
bergquist
9511f89a22 fix(alerting): fixes bug in query conditions 2016-09-08 13:28:41 +02:00
Torkel Ödegaard
23de094a81 feat(alerting/annotations): fixed broken test 2016-09-08 13:22:30 +02:00
bergquist
bec099cd84 tech: remove unused files 2016-09-08 11:41:56 +02:00
Torkel Ödegaard
b8081b29fd Merge branch 'master' into grafana-annotations 2016-09-08 11:26:55 +02:00
Torkel Ödegaard
d60bd77658 feat(annotations): added support to show grafana stored annotations in graphs, #5982 2016-09-08 11:25:45 +02:00
bergquist
3c9432b7e9 fix(metrics): default updateSince to ms 2016-09-08 10:48:11 +02:00
bergquist
acf74cdacc fix(alerting): change execution time to ms 2016-09-08 10:45:10 +02:00
bergquist
5f934e0238 feat(emails): move bg color to main table 2016-09-08 09:59:51 +02:00
bergquist
21c5b543fb feat(profile): hide orgs list when it only contains one org 2016-09-08 09:03:29 +02:00
bergquist
592ae5a39a tests(alerting): fixes broken tests. pointers and stuff 🤷 2016-09-07 17:05:41 +02:00
bergquist
30f36fe2c4 docs(changelog): add note about merging #4718 2016-09-07 15:24:38 +02:00
bergquist
f56d45ac56 feat(alerting): include default notifications in alert tab 2016-09-07 15:13:24 +02:00
bergquist
c769148701 Merge branch 'emails' 2016-09-07 13:52:16 +02:00
bergquist
62372978e4 style: convert tabs to spaces 2016-09-07 13:51:17 +02:00
bergquist
59cb51dc6f test(emails): update fake data model 2016-09-07 13:47:57 +02:00
bergquist
9595916a5f feat: right align value metrics 2016-09-07 13:47:21 +02:00
bergquist
712061ab4f test(alerting): fixes broken unit tests 2016-09-07 11:45:38 +02:00
bergquist
166df66f66 docs(go): update go dep to 1.6 2016-09-07 11:28:22 +02:00
bergquist
f26824049f Merge branch 'master' into emails 2016-09-07 11:19:52 +02:00
bergquist
374016b9b5 Merge branch 'kfitzpatrick-custom-github-style-oauth' 2016-09-07 11:07:30 +02:00
bergquist
10b3ee362c docs(oauth): add generic_auth to docs 2016-09-07 11:06:59 +02:00
bergquist
53dddf1a8f fix(oauth): remove github refs from generic auth 2016-09-07 10:55:46 +02:00