docs(config): add note about poodle vulnerabillity in <3.0

Merge pull request #2648 from yinchuan/patch-2
doc fix: add "Read Only Editor" option to users.auto_assign_org_role …
2025-12-21 20:24:41 +08:00 · 2016-08-31 08:37:35 +02:00 · 2015-09-02 12:37:40 +02:00 · 2015-09-02 17:45:10 +08:00 · 2015-08-24 10:02:44 +02:00
2 changed files with 5 additions and 3 deletions
--- a/docs/sources/installation/configuration.md
+++ b/docs/sources/installation/configuration.md
@@ -82,6 +82,8 @@ Another way is put a webserver like Nginx or Apache in front of Grafana and have

 `http` or `https`

+> **Note** Grafana versions earlier than 3.0 are vulnerable to [POODLE](https://en.wikipedia.org/wiki/POODLE). So we strongly recommend to upgrade to 3.x or use a reverse proxy for ssl termination.
+
 ### domain

 This setting is only used in as a part of the `root_url` setting (see below). Important if you
@@ -209,7 +211,7 @@ organization to be created for that new user.

 The role new users will be assigned for the main organization (if the
 above setting is set to true).  Defaults to `Viewer`, other valid
-options are `Admin` and `Editor`.
+options are `Read Only Editor`, `Editor` and `Admin`.

 <hr>

@@ -228,7 +230,7 @@ to be updated to match the new name.
 ### org_role

 Specify role for anonymous users. Defaults to `Viewer`, other valid
-options are `Editor` and `Admin`.
+options are `Read Only Editor`, `Editor` and `Admin`.

 ## [auth.github]

--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
    "company": "Coding Instinct AB"
  },
  "name": "grafana",
-  "version": "2.1.2",
+  "version": "2.1.3",
  "repository": {
    "type": "git",
    "url": "http://github.com/torkelo/grafana.git"
Author	SHA1	Message	Date
bergquist	1bd3036164	docs(config): add note about poodle vulnerabillity in <3.0	2016-08-31 08:37:35 +02:00
Torkel Ödegaard	a38cb67f63	Merge pull request #2648 from yinchuan/patch-2 doc fix: add "Read Only Editor" option to users.auto_assign_org_role …	2015-09-02 12:37:40 +02:00
yinchuan	6696b49a07	doc fix: add "Read Only Editor" option to users.auto_assign_org_role and auth.anonymous.org_role	2015-09-02 17:45:10 +08:00
Torkel Ödegaard	7f6eccb5e2	Updated version to 2.1.3	2015-08-24 10:02:44 +02:00