public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,002 Commits 655 Branches 650 Tags
01f646c1910706fa4e91651f0394f3ceccb87a08
Commit Graph
10002 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Lee 01f646c191 docs: adds 4.2.0 release date 2017-03-22 14:06:53 +01:00
Torkel Ödegaard 7dd09d4185 Update CHANGELOG.md 2017-03-22 10:51:06 +01:00
Matt 578ba9bbd5 Added scientific notation as a unit for #7763 (#7781) 2017-03-22 10:49:31 +01:00
Torkel Ödegaard 362a349d9f cloudwatch: added #7892 to changelog 2017-03-22 07:20:46 +01:00
gomlgs e99137598e Cloudwatch: Correctly obtain IAM roles within ECS container tasks. (#7892) 
We now obtain credentials based on the container task's role
rather than just relying on the credentials of the enclosing
container instance.

Fixes #6700.
 2017-03-22 07:15:19 +01:00
Trent White 5ed7d65b0e orange grafana.com seemed too much. making it gray 2017-03-21 13:13:35 -04:00
Torkel Ödegaard b21ad3c376 Merge branch 'master' of github.com:grafana/grafana 2017-03-21 17:10:54 +01:00
Trent White a510d85480 format css 2017-03-21 11:17:28 -04:00
Trent White 182a30e22c style tweak 2017-03-21 11:16:42 -04:00
Trent White d4f2f41088 add dashboard and plugin icons to plugin list and dash search 2017-03-21 11:12:58 -04:00
Daniel Lee 69bec98962 chore: update all grafana.org urls to .com 2017-03-21 15:37:55 +01:00
Daniel Lee b9940e618c profile: locks login fields if disable_login_form 
If the auth config variable, disable_login_form, is set to true then
the username and email fields are set to read-only on the profile page.

The reason for this is so that the user does not lock themselves out by
changing their email address or username. Or create a new user by
changing both.

ref #7810
 2017-03-21 14:42:32 +01:00
Torkel Ödegaard 0c372f0b85 Merge branch 'v4.2.x' 2017-03-21 10:36:40 +01:00
Torkel Ödegaard 99064603a4 packaging: added rpm posttrans script to fix config file change, fixes #7686 2017-03-21 10:36:15 +01:00
Daniel Lee 5ecc8a171f template: fix validation for required selects 
Since upgrading to Angular 1.6.1, selects with a default empty option
no longer show a popup with an error on submit. This fix adds an
empty option that is then removed with ng-if. Having the default
option set to null or undefined seems to be the cause of the bug.

The list of changes in 1.6 is here but could not find any obvious
cause for this bug:

https://docs.angularjs.org/guide/migration#migrating-from-1-5-to-1-6
 2017-03-21 10:31:42 +01:00
Daniel Lee 3d3357ee41 docs: add note for #7614 2017-03-20 23:14:33 +01:00
Daniel Lee 94498d533b template: fix validation for required selects 
Since upgrading to Angular 1.6.1, selects with a default empty option
no longer show a popup with an error on submit. This fix adds an
empty option that is then removed with ng-if. Having the default
option set to null or undefined seems to be the cause of the bug.

The list of changes in 1.6 is here but could not find any obvious
cause for this bug:

https://docs.angularjs.org/guide/migration#migrating-from-1-5-to-1-6
 2017-03-20 22:51:55 +01:00
Daniel Lee 65910db991 template: tweak to warning message 2017-03-20 17:14:24 +01:00
Torkel Ödegaard c1c241698a Merge branch 'master' of github.com:grafana/grafana 2017-03-20 16:05:13 +01:00
Torkel Ödegaard adf7645bf5 docs: added alias 2017-03-20 16:04:57 +01:00
Daniel Lee e527aebbf1 Merge pull request #7758 from thuck/template_self_reference_7614 
Validate query to avoid self-reference of variable #7614
 2017-03-20 15:33:48 +01:00
Torkel Ödegaard f78a28395d s3: support for alternative s3 bucket url syntax, closes #7871 2017-03-20 14:11:37 +01:00
Torkel Ödegaard be5c4f47a6 s3: support for alternative s3 bucket url syntax, closes #7871 2017-03-20 14:10:44 +01:00
Torkel Ödegaard 3f76d76be6 Merge branch 'v4.2.x' 2017-03-20 13:39:53 +01:00
Torkel Ödegaard 122b4695e7 Update CHANGELOG.md 2017-03-20 13:37:55 +01:00
Andrii Skomorokhov f2e4269242 Fixed position of tooltip with description at graph. (#7854) 2017-03-20 13:36:00 +01:00
Torkel Ödegaard 711081950e lib: updated dependency, fixes #7579 2017-03-20 13:30:22 +01:00
Torkel Ödegaard dce63ec1d8 docs: updated changelog 2017-03-20 11:40:06 +01:00
Torkel Ödegaard 54c6699c2b usermanagement: disable invite features when login form is disabled, cherry picked from master, #7875 2017-03-20 11:37:33 +01:00
Torkel Ödegaard 970619ed52 Merge branch 'disable-login' 2017-03-20 11:18:41 +01:00
Torkel Ödegaard 6f324cd794 refactor: minor refactorings of #7876 2017-03-20 11:18:29 +01:00
Torkel Ödegaard 4d4e165be7 links: updated links from grafana.net to grafana.com 2017-03-20 10:20:32 +01:00
Mitsuhiro Tanda a67497e679 add new s3 metrics (#7846) 2017-03-20 09:09:08 +01:00
Jens L 5785bfe0cc Add more information for generic oauth2 (#7880) 
Add reference to OpenID's userinfo_endpoint (as in #6351)
 2017-03-20 08:36:43 +01:00
Denis Doria 87027b0f77 Do not collapse if there is only 1-3 queries #7836 (#7878) 
Also has the side effect of new panels having not collapsed queries when
being created
 2017-03-18 15:23:40 +01:00
Torkel Ödegaard 50718b592c docs: added aliases 2017-03-18 08:25:26 +01:00
Dan Cech 51bdb60296 fix docs.grafana.org/plugins 2017-03-17 18:41:02 -04:00
Dan Cech 737c29ec8c disable inviting new users to orgs if login form is disabled 2017-03-17 16:35:05 -04:00
Torkel Ödegaard aaf013b360 Merge branch 'master' of github.com:grafana/grafana 2017-03-17 19:33:38 +01:00
Torkel Ödegaard 19516ebcce docs: minor fix 2017-03-17 19:33:31 +01:00
Andrii Skomorokhov 5cb51631db Fixed position of tooltip with description at graph. (#7854) 2017-03-17 11:48:28 +01:00
Daniel Lee 76fa363613 Merge pull request #7867 from pandurang90/opsgenie_typo_fix 
Typo fix for OpsGenie
 2017-03-17 10:31:47 +01:00
Pandurang Waghulde f3cce7efc9 typo fix for OpsGenie 2017-03-17 12:57:52 +05:30
Daniel Lee 38cab50a0c Merge pull request #7843 from gkman/patch-1 
Update alerting.md
 2017-03-16 12:41:03 +01:00
Torkel Ödegaard 7856e2f16b fix: metrics_panel and time range issue introduced earlier today, fixes #7849 2017-03-16 12:20:23 +01:00
Torkel Ödegaard 32f89f65da fix: Data source group by time interval did not take effect on initial query after dashboard load, fixes #7839 2017-03-16 09:54:33 +01:00
Gregory Kman e9ad71abed Update alerting.md 
Add missing `"`
 2017-03-15 12:00:03 -05:00
Torkel Ödegaard 0b73369c4b docs: fixed docs title issue 2017-03-14 12:21:22 +01:00
Torkel Ödegaard b05fca4fd7 Merge branch 'master' of github.com:grafana/grafana 2017-03-14 11:07:37 +01:00
Torkel Ödegaard 23954f775b Update ISSUE_TEMPLATE.md 2017-03-14 09:46:32 +01:00