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
7,759 Commits 5,416 Branches 554 Tags
5d821d349271774521e2b242bb2dd405127c1d12
Commit Graph

1175 Commits

Author SHA1 Message Date
bergquist
5d821d3492 style(cli): minor fix 2016-08-24 20:27:41 +02:00
bergquist
c087445d51 feat(cli): add db command to cli. 2016-08-24 15:46:26 +02:00
bergquist
c663e32ea8 Merge branch 'database_url' of https://github.com/Scalingo/grafana into Scalingo-database_url 2016-08-19 13:15:44 +02:00
Torkel Ödegaard
f9b628ad0e Merge branch 'v3.1.x' 
Conflicts:
	conf/defaults.ini
	conf/sample.ini
	pkg/metrics/graphite.go
	pkg/metrics/graphite_test.go
 2016-08-17 09:53:46 +02:00
bergquist
f7a9102523 feat(metrics): improve graphite settings 
Fixes the broken support for overriding settings with ENV variables.
closes #5769
 2016-08-15 09:59:55 +02:00
bergquist
cf6736d480 fix(metrics): add ending dot for graphite prefix 2016-08-15 09:58:32 +02:00
bergquist
41790c6709 fix(metrics): hide none existing metrics settings 2016-08-15 09:58:23 +02:00
bergquist
ebecc5e5a0 fix(metrics): make metrics cfg backwards compatible 2016-08-15 09:57:49 +02:00
bergquist
0524d0c625 fix(metrics): replaces . with _ in instance name 
closes #5739
 2016-08-15 09:57:00 +02:00
bergquist
2b2e015d62 feat(cli): add default plugin folder for MAC OS 
closes #5806
 2016-08-15 09:18:56 +02:00
bergquist
7a913f77d3 feat(cli): add default plugin folder for MAC OS 
closes #5806
 2016-08-15 08:54:35 +02:00
Mitsuhiro Tanda
7a1011ac39 (cloudwatch) support ApplicationELB (#5802) 2016-08-14 13:21:17 +02:00
bergquist
2fa97427eb fix(metrics): add ending dot for graphite prefix 2016-08-12 08:06:54 +02:00
bergquist
f07b2ac446 fix(metrics): hide none existing metrics settings 2016-08-11 17:00:09 +02:00
bergquist
03f0bc46a1 fix(metrics): make metrics cfg backwards compatible 2016-08-10 11:15:49 +02:00
bergquist
5b57210aeb fix(metrics): replaces . with _ in instance name 
closes #5739
 2016-08-09 14:06:03 +02:00
Mark Henderson
39be7cf7d7 Added grafana-cli command. Added public documentation for specifying plugin version when installing. (#5665) 2016-07-27 09:41:33 +02:00
Mitsuhiro Tanda
490ea18638 (cloudwatch) fix, don't block by white list (#5632) 2016-07-22 13:15:18 +02:00
Torkel Ödegaard
4bb4d7f7d3 Merge branch 'v3.1.x' 2016-07-12 15:54:31 +02:00
Torkel Ödegaard
b2acac3a41 feat(apps): more polish on app dashboard save warning, #5529 2016-07-12 08:41:56 +02:00
Torkel Ödegaard
65683ab241 feat(table): added sanitize html option to column styles for table panel, fixes #4596 2016-07-11 09:38:06 +02:00
Torkel Ödegaard
4c4cb20bde tech(sass): changed sass lint version to 1.7.0 2016-07-08 22:12:10 +02:00
Torkel Ödegaard
615b692442 feat(apps): fixed unit tests 2016-07-08 18:21:25 +02:00
Torkel Ödegaard
ebdf0564eb feat(apps): plugin dashboard sync is starting to work 2016-07-08 17:44:57 +02:00
Torkel Ödegaard
68a8d9bc91 feat(apps): more work on plugin dashboard sync 2016-07-08 13:41:46 +02:00
Torkel Ödegaard
85be7dd902 feat(apps): progress on app dashboard sync 2016-07-08 12:26:51 +02:00
Torkel Ödegaard
d44325affd feat(apps): progress on app dashboard imports 2016-07-08 09:35:06 +02:00
Torkel Ödegaard
b62f1f00cd feat(apps): auto update dashboard dashboards, #5529 2016-07-07 18:11:03 +02:00
Adrián López
65aa6df45c Warn user if there are no mappings (#5246) 2016-07-06 07:31:42 +02:00
Torkel Ödegaard
5595fc2683 refactor(): refactored date handling and locale handling in #5517 2016-07-05 17:59:43 +02:00
Andris Raugulis
1c293781e3 Log to default log directory, only if custom configuration failed. (#5393) 2016-06-30 16:37:06 -07:00
Soulou
aa064b18e8 Test environment override for secret and url with credentials 2016-06-29 13:49:41 +02:00
Mitsuhiro Tanda
9ca5ba96be reorder metrics/dimensions 2016-06-29 14:11:01 +09:00
Mitsuhiro Tanda
511f8d3213 add cloudwatch metrics and dimensions 2016-06-29 13:55:16 +09:00
Soulou
03d0f11407 Accept URL parameter [database] config 2016-06-28 15:31:34 +02:00
bergquist
af216ecf83 tech(cli): remove loop and head straight for plugindir 2016-06-26 03:47:15 +02:00
bergquist
07be2c89a3 tech(cli): lets use the fact that we have a compiler 2016-06-26 03:47:15 +02:00
Carl Bergquist
c223994155 Merge pull request #5411 from mtanda/pr_dynamodb_add_metrics 
add cloudwatch metrics
 2016-06-25 17:36:50 +02:00
bergquist
16fa631ea0 tech(tests): remove unused code that breaks gorename 2016-06-25 16:34:42 +02:00
bergquist
690a74c6b7 feat(login): invert naming for dissallow user pass login 2016-06-25 16:30:41 +02:00
Kevin Fitzpatrick
040586604b Allow configuration to disable the username and password login interface. 
Used for when admins only want users to login via OAuth.
 2016-06-23 10:09:13 -07:00
bergquist
af1c8dc5d9 feat(cli): adds support for dist/plugin.json location for plugins 
ref #5410
 2016-06-23 08:35:40 +02:00
bergquist
2123fbdf9b feat(cli): make remove command an alias for uninstall 2016-06-23 08:21:55 +02:00
Mitsuhiro Tanda
09f7222e79 add cloudwatch metrics 2016-06-23 11:24:21 +09:00
Torkel Ödegaard
9f9fca1e76 feat(datasource): added suggest urls for each data source, #4577 2016-06-17 13:35:29 +02:00
Torkel Ödegaard
305a6ae110 feat(dashboards): dashboard sharing fixes 2016-06-17 11:36:35 +02:00
Torkel Ödegaard
10daf1d63a Revert "Enable the "limit" param in /api/search" 
This reverts commit 3d77685108.
 2016-06-17 11:22:39 +02:00
Torkel Ödegaard
5c35fac8fe fix(dataproxy): removed accidental debug code 2016-06-17 08:11:37 +02:00
bergquist
8b2f6fffc9 test(dashboards): comment code in broken tests 2016-06-17 07:43:57 +02:00
Torkel Ödegaard
32479503bd fix(build): another windows build issue 2016-06-16 21:10:30 +02:00