Merge branch 'v3.0.x'

pkg/middleware/util.go

@@ -17,6 +17,10 @@ func Gziper() macaron.Handler {
 			return
 		}
 
+		if strings.HasPrefix(requestPath, "/api/plugin-proxy/") {
+			return
+		}
+
 		ctx.Invoke(macaronGziper)
 	}
 }

public/app/plugins/datasource/elasticsearch/datasource.js

@@ -205,7 +205,9 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
     };
 
     function escapeForJson(value) {
-      return value.replace(/\"/g, '\\"');
+      return value
+        .replace(/\s/g, '\\ ')
+        .replace(/\"/g, '\\"');
     }
 
     function luceneThenJsonFormat(value) {