Merge remote-tracking branch 'grafana/master' into expose-get-backend…

…-srv

* grafana/master: (59 commits)
  Chore: Remove implicit anys for DashboardModel and tests (grafana#16553)
  Pushover alert, support for different sound for OK (grafana#16525)
  Chore: Lowered implicit anys limit to 6816
  CloudWatch: Fix template variable expand bug (grafana#16405)
  CloudWatch: fix color order (grafana#16408)
  Plugins: Unifying alpha state & options for all plugins  (grafana#16530)
  Revert "Build: Upgrades to go 1.12.3 (grafana#16491)" (grafana#16544)
  Annotations: Annotation list style improvements   (grafana#16541)
  QueryInspector: Now shows error responses (grafana#16514)
  Build: Upgrades to go 1.12.3 (grafana#16491)
  Build: Update master version number (grafana#16532)
  Elasticsearch: Format elasticsearch test dashboard json (grafana#16537)
  Update jwt regexp to include = (grafana#16521)
  Chore: docs fixes underscore formatting (grafana#16516)
  Fix: Pass missing maxDataPoints to query in Explore (grafana#16513)
  Fix: Recalculate intervals in Explore on run queries (grafana#16510)
  devenv: add elasticsearch v6 filebeat integration (grafana#16493)
  devenv: add worldmap panel panels for elasticsearch (grafana#16313)
  Plugins: Optionally preload some plugins during frontend app boot (grafana#15266)
  Panels: Add types for DataList and range (grafana#16500)
  ...

CHANGELOG.md

@@ -1,5 +1,21 @@
 # 6.2.0 (unreleased)
 
+# 6.1.3 (2019-04-09)
+
+### Bug Fixes
+  * **Graph**: Fixed auto decimals in legend values for some units like `ms` and `s`. [#16455](https://github.com/grafana/grafana/pull/16455), [@torkelo](https://github.com/torkelo)
+  * **Graph**: Fixed png rendering with legend to the right. [#16463](https://github.com/grafana/grafana/pull/16463), [@torkelo](https://github.com/torkelo)
+  * **Singlestat**: Use decimals when manually specified. [#16451](https://github.com/grafana/grafana/pull/16451), [@torkelo](https://github.com/torkelo)
+  * **UI Switch**: Fix broken UI switches. Fixes Default Data Source switch, Explore Logs switches, Gauge option switches. [#16303](https://github.com/grafana/grafana/pull/16303), [@dprokop](https://github.com/dprokop)
+
+# 6.1.2 (2019-04-08)
+
+ ### Bug Fixes
+  * **Graph**: Fixed series legend color for hidden series. [#16438](https://github.com/grafana/grafana/pull/16438), [@Ijin08](https://github.com/Ijin08)
+  * **Graph**: Fixed tooltip highlight on white theme. [#16429](https://github.com/grafana/grafana/pull/16429), [@torkelo](https://github.com/torkelo)
+  * **Styles**: Fixed menu hover highlight border. [#16431](https://github.com/grafana/grafana/pull/16431), [@torkelo](https://github.com/torkelo)
+  * **Singlestat Panel**: Correctly use the override decimals. [#16413](https://github.com/grafana/grafana/pull/16413), [@torkelo](https://github.com/torkelo)
+
 # 6.1.1 (2019-04-05)
 
  ### Bug Fixes

Gopkg.toml

@@ -19,12 +19,26 @@
 #  name = "github.com/x/y"
 #  version = "2.4.0"
 
+required = ["github.com/smartystreets/assertions", "github.com/jtolds/gls"]
+
 ignored = [
   "github.com/grafana/grafana/data/*",
   "github.com/grafana/grafana/public/*",
   "github.com/grafana/grafana/node_modules/*"
  ]
 
+[[constraint]]
+  name = "github.com/smartystreets/goconvey"
+  revision = "68dc04aab96ae4326137d6b77330c224063a927e"
+
+[[constraint]]
+  name = "github.com/smartystreets/assertions"
+  revision = "f487f9de1cd36ebab28235b9373028812fb47cbd"
+
+[[constraint]]
+  name = "github.com/jtolds/gls"
+  revision = "b4936e06046bbecbb94cae9c18127ebe510a2cb9"
+
 [[constraint]]
   name = "github.com/BurntSushi/toml"
   version = "0.3.0"
@@ -151,9 +165,6 @@ ignored = [
   branch = "master"
   name = "github.com/prometheus/common"
 
-[[constraint]]
-  name = "github.com/smartystreets/goconvey"
-  version = "1.6.3"
 
 [[constraint]]
   name = "github.com/uber/jaeger-client-go"
@@ -215,3 +226,7 @@ ignored = [
 [[constraint]]
   name = "gopkg.in/ldap.v3"
   version = "3.0.0"
+
+[[constraint]]
+  name = "github.com/pkg/errors"
+  version = "0.8.0"

ROADMAP.md

@@ -1,32 +1,4 @@
-# Roadmap (2018-08-07)
-
 This roadmap is a tentative plan for the core development team. Things change constantly as PRs come in and priorities change. 
 But it will give you an idea of our current vision and plan. 
 
-### Short term (1-2 months)
-  - PRs & Bugs
-  - React Panel Support
-  - React Query Editor Support
-  - Metrics & Log Explore UI 
-  - Grafana UI library shared between grafana & plugins
-  - Seperate visualization from panels
-  - More reuse between Explore & dashboard
-  - Explore logging support for more data sources 
-
-### Mid term (2-4 months)  
-  - Drilldown links
-  - Dashboards as code workflows 
-  - React migration
-  - New panels 
-
-### Long term (4 - 8 months)
- - Alerting improvements (silence, per series tracking, etc)
-
-### In a distant future far far away
- - Meta queries 
- - Integrated light weight TSDB
- - Web socket & live data sources
-
-### Outside contributions
-We know this is being worked on right now by contributors (and we hope to merge it when it's ready). 
-
+Go to the Issues tab on GitHub. There you will find, at the top, 3 pinned roadmap issues.

conf/defaults.ini

@@ -613,8 +613,13 @@ server_url =
 callback_url =
 
 [panels]
+# here for to support old env variables, can remove after a few months
 enable_alpha = false
 disable_sanitize_html = false
 
+[plugins]
+enable_alpha = false
+app_tls_skip_verify_insecure = false
+
 [enterprise]
 license_path =

conf/sample.ini

@@ -540,7 +540,10 @@ log_queries =
 ;license_path =
 
 [panels]
-;enable_alpha = false
 # If set to true Grafana will allow script tags in text panels. Not recommended as it enable XSS vulnerabilities.
 ;disable_sanitize_html = false
 
+[plugins]
+;enable_alpha = false
+;app_tls_skip_verify_insecure = false
+

devenv/datasources.yaml

@@ -95,6 +95,16 @@ datasources:
       timeField: "@timestamp"
       esVersion: 60
 
+  - name: gdev-elasticsearch-v6-filebeat
+    type: elasticsearch
+    access: proxy
+    database: "[filebeat-6.2.4-]YYYY.MM.DD"
+    url: http://localhost:11200
+    jsonData:
+      interval: Daily
+      timeField: "@timestamp"
+      esVersion: 60
+
   - name: gdev-mysql
     type: mysql
     url: localhost:3306