public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,041 Commits 655 Branches 650 Tags
6ea00a4f7c53c66b604fe5fe45afc19c4cccdf07
Commit Graph
5041 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
utkarshcmu 2a8904f844 Fixed queryCtrl to use suggest API 2015-10-29 11:13:38 -07:00
Torkel Ödegaard 59fc72d37e Merge branch 'prometheus-fix_step_calculation' of https://github.com/dan-cleinmark/grafana into dan-cleinmark-prometheus-fix_step_calculation 2015-10-29 16:50:18 +01:00
Torkel Ödegaard 34e3683ded fix(cloudwatch): fixed limiting of cloudwatch period so it works for long time ranges in all cases, fixes #3086 2015-10-29 16:46:58 +01:00
Torkel Ödegaard 13760b1bdd fix(influxdb): fixed handling of relative time ranges like last x years, or last x months, fixes #3067 2015-10-29 15:53:15 +01:00
Mitsuhiro Tanda 8a252774ce Update cloudwatch.md, add explanation about templating 2015-10-29 23:51:27 +09:00
Dan Cleinmark 963f9fdf40 Ensure Promtheus step interval is always < 11000 
Using a 2 week window (1209600 seconds) and a 60s step, Math.floor()
recalculates a step of 109 and results in 11097 data points in the
Prometheus query (> the 11000 max set by Prometheus). Math.ceil()
returns a step of 110 and 10996 data points.
 2015-10-29 07:24:42 -07:00
Torkel Ödegaard 299a2457cd Merge branch 'master' of github.com:grafana/grafana 2015-10-29 14:05:19 +01:00
Torkel Ödegaard 3de4707c98 feat(elasticsearch): Annotation queries now use the daily index patterns defined in data source options, for old annotations that have an index property that will be used, so will not break existing dashboard/annotation configs, closes #3061 2015-10-29 14:05:05 +01:00
Torkel Ödegaard 603ec65e91 Merge pull request #3059 from mtanda/cloudwatch_template_fix 
fix panel repeat for cloudwatch
 2015-10-29 12:38:22 +01:00
Torkel Ödegaard cdcffcd31e fix(css): restored tooltip background to dark for white theme #3079 2015-10-29 12:32:32 +01:00
Torkel Ödegaard f8a1c7c8a1 docs(cloudwatch): updated docs with info about #3080 2015-10-29 12:22:01 +01:00
Torkel Ödegaard 5d64568f3e refactoring: some minor refactoring and changes to AWS profile PR #3053 2015-10-29 11:44:34 +01:00
Torkel Ödegaard 374fbad06d Merge branch 'master' into peekeri-support_aws_profiles 2015-10-29 11:19:15 +01:00
Torkel Ödegaard aa31336c64 Merge pull request #3072 from utkarshcmu/tooltip 
Added tooltip for cloudwatch datasource
 2015-10-29 11:18:24 +01:00
Torkel Ödegaard 135ba68ff5 Merge branch 'support_aws_profiles' of https://github.com/peekeri/grafana into peekeri-support_aws_profiles 2015-10-29 11:14:04 +01:00
utkarshcmu d3ee81bb5a Added tooltip for cloudwatch datasource 2015-10-28 10:18:44 -07:00
Torkel Ödegaard 4729bea1a2 fix(dashboard): fix for collapse row by clicking on row title, fixes #3065 2015-10-28 15:04:58 +01:00
Torkel Ödegaard e1393f9780 changelog: updated and marked 2.5 as released 2015-10-28 14:46:47 +01:00
Torkel Ödegaard ad7e66cdae Merge pull request #3062 from utkarshcmu/templates 
Fixed typos in 2.5v doc
 2015-10-28 13:00:22 +01:00
utkarshcmu 2f09ef2970 Fixed typos in 2.5v doc 2015-10-28 04:27:51 -07:00
Torkel Ödegaard 6ea2c08ecb docs(): minor docs fix 2015-10-28 11:50:22 +01:00
Mitsuhiro Tanda b82f1edd63 fix panel repeat for cloudwatch 2015-10-28 19:36:49 +09:00
Torkel Ödegaard 1685e7cea4 docs(): update to install docs and whats new in 2.5 2015-10-28 11:08:12 +01:00
Torkel Ödegaard 287d8ca367 fix(changelog): minor spelling fix to changelog 2015-10-28 09:43:28 +01:00
Torkel Ödegaard 6397b8c1ef docs(): updated version to 2.5.0 v2.5.0 2015-10-28 09:31:57 +01:00
Torkel Ödegaard 89eedd59a8 Merge pull request #3008 from mtanda/prometheus_link 
Revert prometheus graph view link
 2015-10-28 09:29:07 +01:00
Nick Christus aa9093bcf6 updated-list-views: added filter-table less component, updating styles for data sources table 2015-10-27 23:26:11 -05:00
Jari Sukanen 23599814a3 cloudwatch: add support for defining AWS profile for CloudWatch datasource 
Add support for defining AWS profile for CloudWatch datasource to support
pulling information from multiple different AWS accounts to single dashboard.

With this change, it is possible to define multiple AWS credentials in
~/.aws/credentials file and connect different data sources to different
AWS accounts.
 2015-10-27 17:00:02 +02:00
Torkel Ödegaard 89ce1a5159 fix(dashlist): minor fix to dashlist panel, and some minor html markup fixes 2015-10-27 13:17:28 +01:00
Torkel Ödegaard 22a4ef42fc version change to 2.5-pre2 2015-10-27 12:22:30 +01:00
Torkel Ödegaard 358ba395ac fix(invite): minor fix to invite partials markup 2015-10-27 12:09:14 +01:00
Torkel Ödegaard e7d5ea8a6c fix(build): revert some build script changes to make building on go 1.4 work again 2015-10-27 12:08:56 +01:00
Torkel Ödegaard a36711e640 fix(changelog): fixed link in changelog 2015-10-27 10:26:44 +01:00
Torkel Ödegaard 6fabff4769 Merge pull request #3049 from utkarshcmu/docs 
Fixed typos in cloudwatch docs
 2015-10-27 07:14:41 +01:00
ubhatnagar 6af86152e6 Removed typos in cloudwatch docs 2015-10-26 21:02:04 -07:00
Torkel Ödegaard 06d97c78c8 Merge pull request #3044 from mattttt/patch-5 
Updates to timepicker docs for 2.5 release
 2015-10-26 21:22:22 +01:00
Matt da31fffb16 Update timerange.md 2015-10-26 14:05:44 -04:00
Matt c97e3ec7ae Updates to timepicker docs for 2.5 release 
Updated images to be in separate PR.
 2015-10-26 14:03:26 -04:00
Torkel Ödegaard 09b3433e32 change(dashboards): made home dashboard and json file dashboards editable unless otherwise specified in json file, closes #2567 2015-10-26 18:54:32 +01:00
Torkel Ödegaard 323e84375b refactoring: minor refactoring and handling of known data source plugins 2015-10-26 16:37:45 +01:00
Torkel Ödegaard 3b67a6a222 changelog: updated changelog with details of #2928 2015-10-26 16:23:29 +01:00
Torkel Ödegaard da3d5375b8 feat(ldap): refactoring of PR #2928 updated docs 2015-10-26 16:21:03 +01:00
Torkel Ödegaard 38bd0d1aec Merge branch 'ldap-improvements' of https://github.com/abligh/grafana into abligh-ldap-improvements 2015-10-26 15:56:21 +01:00
Torkel Ödegaard 59bd029e46 docs(cloudwatch): minor cloudwatch fix 2015-10-26 15:51:34 +01:00
Torkel Ödegaard 1dbf0ad976 docs(cloudwatch): initial cloudwatch docs, closes #2900 2015-10-26 15:44:14 +01:00
Torkel Ödegaard 3b4c095b49 Merge branch 'time-independent-prometheus-metrics' of https://github.com/arthurdandrea/grafana into arthurdandrea-time-independent-prometheus-metrics 2015-10-26 14:35:17 +01:00
Torkel Ödegaard 2e155bdeda fix(dashboard): minor function name fixes, removed insert row above/below because it did not work, #2909 2015-10-26 14:33:55 +01:00
Torkel Ödegaard 8305fd0451 Merge branch 'master' of github.com:grafana/grafana 2015-10-26 14:21:49 +01:00
Torkel Ödegaard 7477667df1 docs(elasticsearch): initial elasticsearch docs, closes #2862 2015-10-26 14:21:38 +01:00
Torkel Ödegaard a066d7ddcb Merge pull request #2909 from utkarshcmu/title 
Added move row to top and bottom and insert row capability.
 2015-10-26 14:15:42 +01:00