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,760 Commits 5,454 Branches 554 Tags 1.9 GiB
1c25d22f9e
Commit Graph

7760 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Bergquist
1c25d22f9e Merge pull request #5875 from mtanda/prometheus_time 
(prometheus) refactor time calculation
 2016-08-22 14:25:52 +02:00
bergquist
69de3bcfc7 chore(example): remove example file and add links 2016-08-22 12:26:26 +02:00
Mitsuhiro Tanda
d9fe41cc8d (prometheus) refactor time calculation 2016-08-20 22:51:33 +09:00
bergquist
3077f992bb docs(changelog): add note about closing #5613 2016-08-19 15:19:08 +02:00
Carl Bergquist
9fdda0e269 Merge pull request #5613 from ctrochalakis/group_by_nodes 
feat(graphite): added groupByNodes func def, closes #5612
 2016-08-19 15:16:40 +02:00
bergquist
8d49b66dae Merge branch 'Scalingo-database_url' 2016-08-19 14:53:38 +02:00
bergquist
aeb1b99648 docs(changelog): add note about closing #5456 2016-08-19 14:51:09 +02:00
bergquist
92a52ccdf7 docs(conf): add more info about using database.url 2016-08-19 14:48:40 +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
bergquist
28ac05b1d1 docs(changelog): add filter for org switcher 
closes #2609
 2016-08-18 15:52:14 +02:00
bergquist
6d60d125d3 Merge branch 'Othyus-filter_orgs' 2016-08-18 15:48:47 +02:00
bergquist
e3bbf96b37 Merge branch 'filter_orgs' of https://github.com/Othyus/grafana into Othyus-filter_orgs 2016-08-18 15:48:01 +02:00
beejeebus
998ed097d3 Update aws-sdk from v1.0.0 to v1.4.1, fixes #5763. (#5813) 2016-08-18 08:19:53 +02:00
Roman Vynar
d086f5d398 Align step with interval passed to Prometheus query using rate() (#5839) 2016-08-18 08:19:32 +02:00
Torkel Ödegaard
6fae5a3b4e Merge branch 'v3.1.x' 2016-08-17 10:02:08 +02:00
Torkel Ödegaard
093563ac37 fix(metrics): restored prefix default to prod.grafana.. 2016-08-17 10:01:55 +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
Torkel Ödegaard
2b2b64865b Merge branch 'master' of github.com:grafana/grafana 2016-08-17 09:42:52 +02:00
Torkel Ödegaard
159ea69e5d fix(OpenTSDB): correct content-type, fixes #4965 2016-08-17 09:42:40 +02:00
Torkel Ödegaard
0951da9c89 Merge branch 'v3.1.x' of github.com:grafana/grafana into v3.1.x 2016-08-16 22:31:51 +02:00
Torkel Ödegaard
a5f0f508ea feat(inspector): fixed error handling, showing response body when data proxy returns text/html body 2016-08-16 22:31:26 +02:00
bergquist
de714e3398 tech(docker): add default db for postgres 2016-08-16 15:54:13 +02:00
Claudius Zingerli
08932b8ebc InfluxDB data source: Removed 'required' attribute from User/Password (#5820) 2016-08-15 17:56:46 +02:00
bergquist
3195209878 tech(circle): rearrange build order 2016-08-15 14:01:20 +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
Torkel Ödegaard
2c1b893c55 feat(metrics): minor fix for internal metrics fix PR #5758 2016-08-15 09:57:23 +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
Torkel Ödegaard
cd9bd5be17 Update CHANGELOG.md 2016-08-15 09:15:20 +02:00
bergquist
7ce13ef075 docs(changelog): add note about fixing #5806 2016-08-15 09:13:49 +02:00
bergquist
7a913f77d3 feat(cli): add default plugin folder for MAC OS 
closes #5806
 2016-08-15 08:54:35 +02:00
Torkel Ödegaard
0ea3458f69 Merge branch 'v3.1.x' 
Conflicts:
	public/app/features/dashboard/dynamic_dashboard_srv.ts
 2016-08-14 14:47:14 +02:00
Torkel Ödegaard
58df60f670 fix(templating): another fix for repeating panels and having old panels/scoped vars stuck after switching repeat variable, fixes #5795 2016-08-14 14:45:49 +02:00
Julian Einwag
cbf0e77add fix repeat panels (#5796) 2016-08-14 13:59:16 +02:00
Torkel Ödegaard
1eca0d7c53 docs(): updated docs 2016-08-14 13:58:04 +02:00
Torkel Ödegaard
76e4b7ce3b Merge branch 'master' of github.com:grafana/grafana 2016-08-14 13:51:09 +02:00
Julian Einwag
deb245f526 fix repeat panels (#5796) 2016-08-14 13:50:49 +02:00
Mitsuhiro Tanda
7a1011ac39 (cloudwatch) support ApplicationELB (#5802) 2016-08-14 13:21:17 +02:00
Torkel Ödegaard
8499d32d0f Merge branch 'master' of github.com:grafana/grafana 2016-08-14 13:18:55 +02:00
Torkel Ödegaard
d894c13718 fix(graph): fixed issue with tooltip introduced in recent commit 2016-08-14 13:18:23 +02:00
Carl Bergquist
a530df8449 Merge pull request #5809 from kou/patch-1 
Update the number of ways
 2016-08-13 12:18:01 +02:00
Kouhei Sutou
46630df88d Update the number of ways 2016-08-13 14:12:29 +09: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
Torkel Ödegaard
da6ac07b1d Merge branch 'v3.1.x' 2016-08-11 10:29:48 +02:00
Torkel Ödegaard
0d26bc63ae fix(graphite): minor fix/improvement to graphite error handling when doing metric exploration in query editor, fixes #5778 2016-08-11 10:29:28 +02:00
Torkel Ödegaard
780ec92dd8 fix(docs): fixed plugins docs, fixes #5777 2016-08-11 07:39:34 +02:00