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

Revert "Merge pull request #4401 from dfwarden/goldap_versionbump"
This reverts commit 8f14a9ba26, reversing changes made to 957ecabf20.
2025-12-20 19:44:55 +08:00 · 2016-08-31 08:36:51 +02:00 · 2016-03-22 09:23:13 +01:00 · 2016-03-20 10:55:37 +01:00 · 2016-03-17 14:25:27 -04:00 · 2016-03-17 14:25:00 -04:00
2 changed files with 7 additions and 5 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
@@ -396,10 +398,10 @@ How long sessions lasts in seconds. Defaults to `86400` (24 hours).

 ### reporting_enabled

-When enabled Grafana will send anonymous usage statistics to 
+When enabled Grafana will send anonymous usage statistics to
 `stats.grafana.org`. No IP addresses are being tracked, only simple counters to
 track running instances, versions, dashboard & error counts. It is very helpful
-to us, so please leave this enabled. Counters are sent every 24 hours. Default 
+to us, so please leave this enabled. Counters are sent every 24 hours. Default
 value is `true`.

 ### google_analytics_ua_id
--- a/public/app/plugins/datasource/prometheus/query_ctrl.js
+++ b/public/app/plugins/datasource/prometheus/query_ctrl.js
@@ -7,7 +7,7 @@ function (angular, _) {

  var module = angular.module('grafana.controllers');

-  module.controller('PrometheusQueryCtrl', function($scope) {
+  module.controller('PrometheusQueryCtrl', function($scope, templateSrv) {

    $scope.init = function() {
      var target = $scope.target;
@@ -46,9 +46,9 @@ function (angular, _) {

    $scope.linkToPrometheus = function() {
      var range = Math.ceil(($scope.range.to.valueOf() - $scope.range.from.valueOf()) / 1000);
-      var endTime = $scope.range.to.utc().format('YYYY-MM-DD HH:MM');
+      var endTime = $scope.range.to.utc().format('YYYY-MM-DD HH:mm');
      var expr = {
-        expr: $scope.target.expr,
+        expr: templateSrv.replace($scope.target.expr, $scope.panel.scopedVars),
        range_input: range + 's',
        end_input: endTime,
        step_input: '',
Author	SHA1	Message	Date
bergquist	be8379d1a7	docs(config): add note about poodle vulnerabillity in <3.0	2016-08-31 08:36:51 +02:00
Torkel Ödegaard	9bb4551bbf	Revert "Merge pull request #4401 from dfwarden/goldap_versionbump" This reverts commit `8f14a9ba26`, reversing changes made to `957ecabf20`.	2016-03-22 09:23:13 +01:00
Torkel Ödegaard	8f14a9ba26	Merge pull request #4401 from dfwarden/goldap_versionbump Versionbump go-ldap for nested LDAP group support	2016-03-20 10:55:37 +01:00
David Warden	109525b2a1	documentation for ldap nested groups	2016-03-17 14:25:27 -04:00
David Warden	e673e29f22	version bump go-ldap to v2.2.1	2016-03-17 14:25:00 -04:00
Mitsuhiro Tanda	957ecabf20	fix end time of Prometheus link	2016-01-14 09:07:15 +01:00
Mitsuhiro Tanda	d2955155de	fix Prometheus link, expand template variable in expression	2016-01-14 09:06:28 +01:00