docs: fix for docs sidemenu order

build: updated version to v4.5.2
templating: fix dependent variable updating (#9306 )
2025-12-22 04:34:27 +08:00 · 2018-01-30 16:13:45 +01:00 · 2017-09-22 10:34:03 +02:00 · 2017-09-22 10:28:03 +02:00 · 2017-09-22 10:26:48 +02:00 · 2017-09-22 10:22:38 +02:00
7 changed files with 24 additions and 5 deletions
--- a/docs/sources/installation/index.md
+++ b/docs/sources/installation/index.md
@@ -7,6 +7,7 @@ aliases = ["installation/installation/", "v2.1/installation/install/"]
 [menu.docs]
 name = "Installation"
 identifier = "installation"
+weight = 1
 +++

 ## Installing Grafana
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
    "company": "Grafana Labs"
  },
  "name": "grafana",
-  "version": "4.5.1",
+  "version": "4.5.2",
  "repository": {
    "type": "git",
    "url": "http://github.com/grafana/grafana.git"
--- a/pkg/api/cloudwatch/metrics.go
+++ b/pkg/api/cloudwatch/metrics.go
@@ -126,7 +126,7 @@ func init() {
 		"AWS/NATGateway":       {"NatGatewayId"},
 		"AWS/OpsWorks":         {"StackId", "LayerId", "InstanceId"},
 		"AWS/Redshift":         {"NodeID", "ClusterIdentifier"},
-		"AWS/RDS":              {"DBInstanceIdentifier", "DBClusterIdentifier", "DatabaseClass", "EngineName", "Role"},
+		"AWS/RDS":              {"DBInstanceIdentifier", "DBClusterIdentifier", "DbClusterIdentifier", "DatabaseClass", "EngineName", "Role"},
 		"AWS/Route53":          {"HealthCheckId", "Region"},
 		"AWS/S3":               {"BucketName", "StorageType", "FilterId"},
 		"AWS/SES":              {},
--- a/pkg/api/route_register.go
+++ b/pkg/api/route_register.go
@@ -8,6 +8,7 @@ import (

 type Router interface {
 	Handle(method, pattern string, handlers []macaron.Handler) *macaron.Route
+	Get(pattern string, handlers ...macaron.Handler) *macaron.Route
 }

 type RouteRegister interface {
@@ -62,7 +63,14 @@ func (rr *routeRegister) Group(pattern string, fn func(rr RouteRegister), handle

 func (rr *routeRegister) Register(router Router) *macaron.Router {
 	for _, r := range rr.routes {
-		router.Handle(r.method, r.pattern, r.handlers)
+		// GET requests have to be added to macaron routing using Get()
+		// Otherwise HEAD requests will not be allowed.
+		// https://github.com/go-macaron/macaron/blob/a325110f8b392bce3e5cdeb8c44bf98078ada3be/router.go#L198
+		if r.method == http.MethodGet {
+			router.Get(r.pattern, r.handlers...)
+		} else {
+			router.Handle(r.method, r.pattern, r.handlers)
+		}
 	}

 	for _, g := range rr.groups {
--- a/pkg/api/route_register_test.go
+++ b/pkg/api/route_register_test.go
@@ -1,6 +1,7 @@
 package api

 import (
+	"net/http"
 	"strconv"
 	"testing"

@@ -21,6 +22,16 @@ func (fr *fakeRouter) Handle(method, pattern string, handlers []macaron.Handler)
 	return &macaron.Route{}
 }

+func (fr *fakeRouter) Get(pattern string, handlers ...macaron.Handler) *macaron.Route {
+	fr.route = append(fr.route, route{
+		pattern:  pattern,
+		method:   http.MethodGet,
+		handlers: handlers,
+	})
+
+	return &macaron.Route{}
+}
+
 func emptyHandlers(n int) []macaron.Handler {
 	res := []macaron.Handler{}
 	for i := 1; n >= i; i++ {
--- a/public/app/features/dashboard/unsaved_changes_modal.ts
+++ b/public/app/features/dashboard/unsaved_changes_modal.ts
@@ -10,7 +10,7 @@ const  template = `
      <span class="p-l-1">Unsaved changes</span>
    </h2>

-    <a class="modal-header-close" ng-click="dismiss();">
+    <a class="modal-header-close" ng-click="ctrl.dismiss();">
      <i class="fa fa-remove"></i>
    </a>
  </div>
--- a/public/app/features/templating/variable_srv.ts
+++ b/public/app/features/templating/variable_srv.ts
@@ -43,7 +43,6 @@ export class VariableSrv {
      var previousOptions = variable.options.slice();

      return variable.updateOptions()
-      .then(this.variableUpdated.bind(this, variable))
      .then(() => {
        if (angular.toJson(previousOptions) !== angular.toJson(variable.options)) {
          this.$rootScope.$emit('template-variable-value-updated');
Author	SHA1	Message	Date
Torkel Ödegaard	0952847a02	docs: fix for docs sidemenu order	2018-01-30 16:13:45 +01:00
Torkel Ödegaard	ec2b0fe6bf	build: updated version to v4.5.2	2017-09-22 10:34:03 +02:00
Alexander Zobnin	7490963cc1	templating: fix dependent variable updating (#9306 ) (cherry picked from commit `fdec9a4daf`)	2017-09-22 10:28:03 +02:00
Gordon McGuire	a220c84ec0	fix: close for 'Unsaved Changes' modal, #9284 (#9313 ) Missing reference to the controller instance. (cherry picked from commit `5e013f82b4`)	2017-09-22 10:26:48 +02:00
Will Sewell	155b426376	Add `DbClusterIdentifier` to CloudWatch dimensions (#9297 ) Unfortunately CloudWatch dimensions are case-sensitive and it uses both `DBClusterIdentifier` and `DbClusterIdentifier` (notice the lower case `b`) depending on the metric. All metrics which also have the `Role` dimension appear to use `DBClusterIdentifier`, whereas metric with the `EngineName` dimension use `DbClusterIdentifier`. (cherry picked from commit `4a6da233d9`)	2017-09-22 10:22:38 +02:00
bergquist	6aef001647	bug: enable HEAD requests again ref #9307	2017-09-20 09:53:29 +02:00