Merge remote-tracking branch 'grafana/master' into multi-resolution-q…

…uery

* grafana/master: (26 commits)
  Loki: remove live option for logs panel (grafana#19533)
  Chore: Updates to 6.4.0 stable (grafana#19528)
  CloudWatch: Add ap-east-1 to hard-coded region lists (grafana#19523)
  ChangeLog: Release 6.4.0 Stable (grafana#19526)
  Docs: Add notice about plugins that need updating (grafana#19519)
  Panels: Skip re-rendering panel/visualisation in loading state   (grafana#19518)
  Docs: LDAP Debug View documentation (grafana#19513)
  Docs: reports feature (grafana#19472)
  SeriesOverrides: Fixed issue with color picker
  Build: Fix building when $LDFLAGS is set (grafana#19509)
  API: Add `createdAt` and `updatedAt` to api/users/lookup (grafana#19496)
  Fix logs panel image path
  Logs: Publish logs panel (grafana#19504)
  Explore: Update broken link to logql docs (grafana#19510)
  Chore: Remove console.log (grafana#19412)
  Refactor: Split LogRow component (grafana#19471)
  Build: Upgrade go to 1.12.10 (grafana#19499)
  CLI: Fix version selection for plugin install (grafana#19498)
  Upgrade grafana-plugin-model (grafana#19438)
  grafana-ui: Moves slate types from devDependencies to dependencies (grafana#19470)
  ...

.circleci/config.yml

@@ -19,7 +19,7 @@ version: 2
 jobs:
   mysql-integration-test:
     docker:
-      - image: circleci/golang:1.12.9
+      - image: circleci/golang:1.12.10
       - image: circleci/mysql:5.6-ram
         environment:
           MYSQL_ROOT_PASSWORD: rootpass
@@ -39,7 +39,7 @@ jobs:
 
   postgres-integration-test:
     docker:
-      - image: circleci/golang:1.12.9
+      - image: circleci/golang:1.12.10
       - image: circleci/postgres:9.3-ram
         environment:
           POSTGRES_USER: grafanatest
@@ -58,7 +58,7 @@ jobs:
 
   cache-server-test:
     docker:
-      - image: circleci/golang:1.12.9
+      - image: circleci/golang:1.12.10
       - image: circleci/redis:4-alpine
       - image: memcached
     working_directory: /go/src/github.com/grafana/grafana
@@ -144,7 +144,7 @@ jobs:
 
   lint-go:
     docker:
-      - image: circleci/golang:1.12.9
+      - image: circleci/golang:1.12.10
         environment:
           # we need CGO because of go-sqlite3
           CGO_ENABLED: 1
@@ -185,7 +185,7 @@ jobs:
 
   test-backend:
     docker:
-      - image: circleci/golang:1.12.9
+      - image: circleci/golang:1.12.10
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -195,7 +195,7 @@ jobs:
 
   build-all:
     docker:
-     - image: grafana/build-container:1.2.8
+     - image: grafana/build-container:1.2.9
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -239,7 +239,7 @@ jobs:
 
   build:
     docker:
-     - image: grafana/build-container:1.2.8
+     - image: grafana/build-container:1.2.9
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -268,7 +268,7 @@ jobs:
 
   build-fast-backend:
     docker:
-     - image: grafana/build-container:1.2.8
+     - image: grafana/build-container:1.2.9
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -285,7 +285,7 @@ jobs:
 
   build-fast-frontend:
     docker:
-     - image: grafana/build-container:1.2.8
+     - image: grafana/build-container:1.2.9
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -309,7 +309,7 @@ jobs:
 
   build-fast-package:
     docker:
-     - image: grafana/build-container:1.2.8
+     - image: grafana/build-container:1.2.9
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -336,7 +336,7 @@ jobs:
 
   build-fast-save:
     docker:
-     - image: grafana/build-container:1.2.8
+     - image: grafana/build-container:1.2.9
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -425,7 +425,7 @@ jobs:
 
   build-enterprise:
     docker:
-     - image: grafana/build-container:1.2.8
+     - image: grafana/build-container:1.2.9
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -460,7 +460,7 @@ jobs:
 
   build-all-enterprise:
     docker:
-    - image: grafana/build-container:1.2.8
+    - image: grafana/build-container:1.2.9
     working_directory: /go/src/github.com/grafana/grafana
     steps:
     - checkout

CHANGELOG.md

@@ -1,4 +1,19 @@
-# 6.4.0 (unreleased)
+# 6.4.0 (2019-10-01)
+
+### Features / Enhancements
+* **Build**: Upgrade go to 1.12.10. [#19499](https://github.com/grafana/grafana/pull/19499), [@marefr](https://github.com/marefr)
+* **DataLinks**: Suggestions menu improvements. [#19396](https://github.com/grafana/grafana/pull/19396), [@dprokop](https://github.com/dprokop)
+* **Explore**: Take root_url setting into account when redirecting from dashboard to explore. [#19447](https://github.com/grafana/grafana/pull/19447), [@ivanahuckova](https://github.com/ivanahuckova)
+* **Explore**: Update broken link to logql docs. [#19510](https://github.com/grafana/grafana/pull/19510), [@ivanahuckova](https://github.com/ivanahuckova)
+* **Logs**: Adds Logs Panel as a visualization. [#19504](https://github.com/grafana/grafana/pull/19504), [@davkal](https://github.com/davkal)
+
+### Bug Fixes
+* **CLI**: Fix version selection for plugin install. [#19498](https://github.com/grafana/grafana/pull/19498), [@aocenas](https://github.com/aocenas)
+* **Graph**: Fixes minor issue with series override color picker and custom color . [#19516](https://github.com/grafana/grafana/pull/19516), [@torkelo](https://github.com/torkelo)
+
+## Plugins that need updating when upgrading from 6.3 to 6.4
+
+* [Splunk](https://grafana.com/grafana/plugins/grafana-splunk-datasource)
 
 # 6.4.0-beta2 (2019-09-25)
 

Dockerfile

@@ -1,5 +1,5 @@
 # Golang build container
-FROM golang:1.12.9-alpine
+FROM golang:1.12.10-alpine
 
 RUN apk add --no-cache gcc g++
 

build.go

@@ -529,7 +529,7 @@ func ldflags() string {
 	b.WriteString(fmt.Sprintf(" -X main.buildstamp=%d", buildStamp()))
 	b.WriteString(fmt.Sprintf(" -X main.buildBranch=%s", getGitBranch()))
 	if v := os.Getenv("LDFLAGS"); v != "" {
-		b.WriteString(fmt.Sprintf(" -extldflags=%s", v))
+		b.WriteString(fmt.Sprintf(" -extldflags \"%s\"", v))
 	}
 	return b.String()
 }

docs/README.md

@@ -61,19 +61,29 @@ Open [localhost:3004](http://localhost:3004) to view the docs.
 
 ### Images & Content
 
-All markdown files are located in this repo (main grafana repo). But all images are added to the https://github.com/grafana/website repo. So the process of adding images is a bit complicated.
+All markdown files are part of [this repository](https://github.com/grafana/grafana). However, all images are added to the [website repository](https://github.com/grafana/website). Therefore, the process of adding images is not as straightforward. These are the steps:
 
-First you need create a feature (PR) branch of https://github.com/grafana/website so you can make change. Then add the image to the `/static/img/docs` directory. Then make a commit that adds the image.
+1. Ensure you create a feature branch within the [website repository](https://github.com/grafana/website) to make the change. This branch needs to be based on the `old-docs` branch. 
+2. Ensure the image(s) are compressed and optimised e.g. Using [tinypng](https://tinypng.com/)
+2. Add the image(s) to the `/static/img/docs` directory
+3. Then, make a commit that adds the image(s)
+4. The Pull Request you create needs to target where you branched off, the branch `old-docs`
 
-Then run:
+Finally, run:
 ```
 make docs-build
 ```
 
-This will rebuild the docs docker container.
+This will rebuild the docs docker image.
 
-To be able to use the image you have to quit  (CTRL-C) the `make watch` command (that you run in the same directory as this README). Then simply rerun `make watch`, it will restart the docs server but now with access to your image.
+To be able to use your image(s) you have to quit  (CTRL-C) the `make watch` command (that you run in the same directory as this README). Then simply rerun `make watch`, it will restart the docs server but now with access to your image(s).
 
 ### Editing content
 
 Changes to the markdown files should automatically cause a docs rebuild and live reload should reload the page in your browser.
+
+### Troubleshooting
+
+#### Running `make watch` errors out with `Warning: Task "default" not found.`
+
+Ensure that the docker image from the [website repository](https://github.com/grafana/website) is built using the `old-docs` branch.

docs/sources/_index.md

@@ -36,7 +36,7 @@ aliases = ["/v1.1", "/guides/reference/admin", "/v3.1"]
         <h5>Nightly Builds</h5>
     </a>
     <div class="nav-cards__item nav-cards__item--install">
-        <h5>For other platforms Read the <a href="{{< relref "project/building_from_source.md" >}}">build from source</a>
+        <h5>For other platforms read the <a href="{{< relref "project/building_from_source.md" >}}">build from source</a>
         instructions for more information.</h5>
     </div>
 </div>
@@ -46,27 +46,27 @@ aliases = ["/v1.1", "/guides/reference/admin", "/v3.1"]
 <div class="nav-cards">
     <a href="https://grafana.com/grafana" class="nav-cards__item nav-cards__item--guide">
         <h4>What is Grafana?</h4>
-        <p>Grafana feature highlights.</p>
+        <p>Get an overview of Grafana's key features.</p>
     </a>
     <a href="{{< relref "installation/configuration.md" >}}" class="nav-cards__item nav-cards__item--guide">
         <h4>Configure Grafana</h4>
-        <p>Article on all the Grafana configuration and setup options.</p>
+        <p>Review the configuration and setup options.</p>
     </a>
     <a href="{{< relref "guides/getting_started.md" >}}" class="nav-cards__item nav-cards__item--guide">
-        <h4>Getting Started</h4>
-        <p>A guide that walks you through the basics of using Grafana</p>
+        <h4>Getting started</h4>
+        <p>Learn the basics of using Grafana.</p>
     </a>
     <a href="{{< relref "administration/provisioning.md" >}}" class="nav-cards__item nav-cards__item--guide">
         <h4>Provisioning</h4>
-        <p>A guide to help you automate your Grafana setup & configuration.</p>
+        <p>Learn how to automate your Grafana configuration.</p>
     </a>
     <a href="{{< relref "guides/whats-new-in-v6-3.md" >}}" class="nav-cards__item nav-cards__item--guide">
         <h4>What's new in v6.3</h4>
-        <p>Article on all the new cool features and enhancements in v6.3</p>
+        <p>Explore the features and enhancements in the latest release.</p>
     </a>
     <a href="{{< relref "tutorials/screencasts.md" >}}" class="nav-cards__item nav-cards__item--guide">
         <h4>Screencasts</h4>
-        <p>Video tutorials & guides</p>
+        <p>Watch Grafana video tutorials and guides.</p>
     </a>
 </div>
 

docs/sources/administration/reports.md

@@ -0,0 +1,40 @@
++++
+title = "Reports"
+description = ""
+keywords = ["grafana", "reports"]
+type = "docs"
+[menu.docs]
+parent = "admin"
+weight = 8
++++
+
+# Reports
+
+> Reports are only available in Grafana Enterprise. Read more about [Grafana Enterprise]({{< relref "enterprise" >}}).
+
+> Only available in Grafana v6.4+
+
+With Reports you can generate PDFs of any of your Dashboards and have them sent out to interested parties on a schedule.
+
+{{< docs-imagebox img="/img/docs/enterprise/reports_list.png" max-width="500px" class="docs-image--no-shadow" >}}
+
+## Dashboard as a Report
+
+With Reports there are a few things to keep in mind, most importantly, any changes you make to the Dashboard used in a report will be reflected in the report. If you change the time range in the Dashboard the time range will be the same in the report as well. 
+
+## Setup
+
+> SMTP must be configured for reports to be sent
+
+{{< docs-imagebox img="/img/docs/enterprise/reports_create_new.png" max-width="500px" class="docs-image--no-shadow" >}}
+
+Currently only Organisation Admins can create reports. To get to report click on the reports icon in the side menu. This will allow you to list, create and update your reports. 
+
+| Setting       | Description                                                       |
+| --------------|------------------------------------------------------------------ |
+| Name          | name of the Report                                                |
+| Dashboard     | what dashboard to generate the report from                        |
+| Recipients    | emails of the people who will receive this report                 | 
+| ReplyTo       | your email address, so that the recipient can respond             |
+| Message       | message body in the email with the report                         |
+| Schedule      | how often do you want the report generated and sent               |

docs/sources/auth/ldap.md

@@ -90,6 +90,25 @@ member_of = "memberOf"
 email =  "email"
 ```
 
+## LDAP Debug View
+
+> Only available in Grafana v6.4+
+
+Grafana has an LDAP debug view built-in which allows you to test your LDAP configuration directly within Grafana. At the moment of writing, only Grafana admins can use the LDAP debug view.
+
+Within this view, you'll be able to see which LDAP servers are currently reachable and test your current configuration.
+
+{{< docs-imagebox img="/img/docs/ldap_debug.png" class="docs-image--no-shadow" max-width="600px" >}}
+
+
+To use the debug view:
+
+ 1. Type the username of a user that exists within any of your LDAP server(s)
+ 2. Then, press "Run"
+ 3. If the user is found within any of your LDAP instances, the mapping information is displayed
+
+{{< docs-imagebox img="/img/docs/ldap_debug_mapping_testing.png" class="docs-image--no-shadow" max-width="600px" >}}
+
 ### Bind
 
 #### Bind & Bind Password

docs/sources/contribute/development/_index.md

@@ -0,0 +1,11 @@
++++
+title = "Development"
+type = "docs"
+[menu.docs]
+name = "Development"
+identifier = "development"
+parent = "contribute"
+weight = 2
++++
+
+# Development