Merge remote-tracking branch 'grafana/master' into skip-nulls-gauge

* grafana/master: (87 commits)
  API: adds redirect helper to simplify http redirects (grafana#19180)
  docs: image rendering (grafana#19183)
  Chore: Update latest.json (grafana#19177)
  Chore: Update version to next (grafana#19169)
  Docs: What's new in 6.4 update (grafana#19175)
  Devenv: create slow_proxy_mac (grafana#19174)
  Chore: Changelog for v6.4.0-beta1 (grafana#19171)
  Revert "Chore: Update Slate to 0.47.8 (grafana#18412)" (grafana#19167)
  Chore: Update Slate to 0.47.8 (grafana#18412)
  Changelog: Breaking changes and deprecation notes for v6.4 (grafana#19164)
  Docs: What's new 6.4 draft (grafana#19144)
  Docs: Add docs around feature toggles config (grafana#19162)
  Azure Monitor: Add support for cross resource queries (grafana#19115)
  Api: Readonly datasources should not be created via the API (grafana#19006)
  Explore: Update live tail buttons (grafana#19143)
  LDAP: only show tab if LDAP is enabled (grafana#19156)
  TimePicker: Fixes onBlur issue with FireFox on MacOS (grafana#19154)
  Feature: Encapsulated dynamic imports with error boundary and suspense (grafana#19128)
  Metrics: Adds setting for turning off total stats metrics (grafana#19142)
  Add directions for more details provided when not anymore on issue triage (grafana#19116)
  ...

.circleci/config.yml

@@ -672,6 +672,21 @@ jobs:
           name: Release next packages
           command: './scripts/circle-release-next-packages.sh'
 
+  release-packages:
+    docker:
+      - image: circleci/node:10
+    steps:
+      - checkout
+      - run:
+          name: Boostrap lerna
+          command: 'npx lerna bootstrap'
+      - run:
+          name: npm - Prepare auth token
+          command: 'echo //registry.npmjs.org/:_authToken=$NPM_TOKEN >> ~/.npmrc'
+      - run:
+          name: Release packages
+          command: ./scripts/build/release-packages.sh "${CIRCLE_TAG}"
+
 workflows:
   version: 2
   build-master:
@@ -754,6 +769,7 @@ workflows:
             - build-all
             - test-frontend
           filters: *filter-only-master
+
   release:
     jobs:
       - build-all:
@@ -810,6 +826,18 @@ workflows:
             - mysql-integration-test
             - postgres-integration-test
           filters: *filter-only-release
+      - release-packages:
+          requires:
+            - build-all
+            - test-backend
+            - test-frontend
+            - codespell
+            - lint-go
+            - shellcheck
+            - mysql-integration-test
+            - postgres-integration-test
+            - build-oss-msi
+          filters: *filter-only-release
       - build-oss-msi:
           requires:
             - build-all

CHANGELOG.md

@@ -1,9 +1,87 @@
 # 6.4.0 (unreleased)
 
-### Breaking changes
+# 6.4.0-beta1 (2019-09-17)
+
+### Features / Enhancements
+* **API**: Readonly datasources should not be created via the API. [#19006](https://github.com/grafana/grafana/pull/19006), [@papagian](https://github.com/papagian)
+* **Alerting**: Include configured AlertRuleTags in Webhooks notifier. [#18233](https://github.com/grafana/grafana/pull/18233), [@dominic-miglar](https://github.com/dominic-miglar)
+* **Annotations**: Add annotations support to Loki. [#18949](https://github.com/grafana/grafana/pull/18949), [@aocenas](https://github.com/aocenas)
+* **Annotations**: Use a single row to represent a region. [#17673](https://github.com/grafana/grafana/pull/17673), [@ryantxu](https://github.com/ryantxu)
+* **Auth**: Allow inviting existing users when login form is disabled. [#19048](https://github.com/grafana/grafana/pull/19048), [@548017](https://github.com/548017)
+* **Azure Monitor**: Add support for cross resource queries. [#19115](https://github.com/grafana/grafana/pull/19115), [@sunker](https://github.com/sunker)
+* **CLI**: Allow installing custom binary plugins. [#17551](https://github.com/grafana/grafana/pull/17551), [@aocenas](https://github.com/aocenas)
+* **Dashboard**: Adds Logs Panel (alpha) as visualization option for Dashboards. [#18641](https://github.com/grafana/grafana/pull/18641), [@hugohaggmark](https://github.com/hugohaggmark)
+* **Dashboard**: Reuse query results between panels . [#16660](https://github.com/grafana/grafana/pull/16660), [@ryantxu](https://github.com/ryantxu)
+* **Dashboard**: Set time to to 23:59:59 when setting To time using calendar. [#18595](https://github.com/grafana/grafana/pull/18595), [@simPod](https://github.com/simPod)
+* **DataLinks**: Add DataLinks support to Gauge, BarGauge and SingleStat2 panel. [#18605](https://github.com/grafana/grafana/pull/18605), [@ryantxu](https://github.com/ryantxu)
+* **DataLinks**: Enable access to labels & field names. [#18918](https://github.com/grafana/grafana/pull/18918), [@torkelo](https://github.com/torkelo)
+* **DataLinks**: Enable multiple data links per panel. [#18434](https://github.com/grafana/grafana/pull/18434), [@dprokop](https://github.com/dprokop)
+* **Docker**: switch docker image to alpine base with phantomjs support. [#18468](https://github.com/grafana/grafana/pull/18468), [@DanCech](https://github.com/DanCech)
+* **Elasticsearch**: allow templating queries to order by doc_count. [#18870](https://github.com/grafana/grafana/pull/18870), [@hackery](https://github.com/hackery)
+* **Explore**: Add throttling when doing live queries. [#19085](https://github.com/grafana/grafana/pull/19085), [@aocenas](https://github.com/aocenas)
+* **Explore**: Adds ability to go back to dashboard, optionally with query changes. [#17982](https://github.com/grafana/grafana/pull/17982), [@kaydelaney](https://github.com/kaydelaney)
+* **Explore**: Reduce default time range to last hour. [#18212](https://github.com/grafana/grafana/pull/18212), [@davkal](https://github.com/davkal)
+* **Gauge/BarGauge**: Support decimals for min/max. [#18368](https://github.com/grafana/grafana/pull/18368), [@ryantxu](https://github.com/ryantxu)
+* **Graph**: New series override transform constant that renders a single point as a line across the whole graph. [#19102](https://github.com/grafana/grafana/pull/19102), [@davkal](https://github.com/davkal)
+* **Image rendering**: Add deprecation warning when PhantomJS is used for rendering images. [#18933](https://github.com/grafana/grafana/pull/18933), [@papagian](https://github.com/papagian)
+* **InfluxDB**: Enable interpolation within ad-hoc filter values. [#18077](https://github.com/grafana/grafana/pull/18077), [@kvc-code](https://github.com/kvc-code)
+* **LDAP**: Allow an user to be synchronized against LDAP. [#18976](https://github.com/grafana/grafana/pull/18976), [@gotjosh](https://github.com/gotjosh)
+* **Ldap**: Add ldap debug page. [#18759](https://github.com/grafana/grafana/pull/18759), [@peterholmberg](https://github.com/peterholmberg)
+* **Loki**: Remove prefetching of default label values. [#18213](https://github.com/grafana/grafana/pull/18213), [@davkal](https://github.com/davkal)
+* **Metrics**: Add failed alert notifications metric. [#18089](https://github.com/grafana/grafana/pull/18089), [@koorgoo](https://github.com/koorgoo)
+* **OAuth**: Support JMES path lookup when retrieving user email. [#14683](https://github.com/grafana/grafana/pull/14683), [@bobmshannon](https://github.com/bobmshannon)
+* **OAuth**: return GitLab groups as a part of user info (enable team sync). [#18388](https://github.com/grafana/grafana/pull/18388), [@alexanderzobnin](https://github.com/alexanderzobnin)
+* **Panels**: Add unit for electrical charge - ampere-hour. [#18950](https://github.com/grafana/grafana/pull/18950), [@anirudh-ramesh](https://github.com/anirudh-ramesh)
+* **Plugin**: AzureMonitor - Reapply MetricNamespace support. [#17282](https://github.com/grafana/grafana/pull/17282), [@raphaelquati](https://github.com/raphaelquati)
+* **Plugins**: better warning when plugins fail to load. [#18671](https://github.com/grafana/grafana/pull/18671), [@ryantxu](https://github.com/ryantxu)
+* **Postgres**: Add support for scram sha 256 authentication. [#18397](https://github.com/grafana/grafana/pull/18397), [@nonamef](https://github.com/nonamef)
+* **RemoteCache**: Support SSL with Redis. [#18511](https://github.com/grafana/grafana/pull/18511), [@kylebrandt](https://github.com/kylebrandt)
+* **SingleStat**: The gauge option in now disabled/hidden (unless it's an old panel with it already enabled) . [#18610](https://github.com/grafana/grafana/pull/18610), [@ryantxu](https://github.com/ryantxu)
+* **Stackdriver**: Add extra alignment period options. [#18909](https://github.com/grafana/grafana/pull/18909), [@sunker](https://github.com/sunker)
+* **Units**: Add South African Rand (ZAR) to currencies. [#18893](https://github.com/grafana/grafana/pull/18893), [@jeteon](https://github.com/jeteon)
+* **Units**: Adding T,P,E,Z,and Y bytes. [#18706](https://github.com/grafana/grafana/pull/18706), [@chiqomar](https://github.com/chiqomar)
+
+### Bug Fixes
+* **Alerting**: Notification is sent when state changes from no_data to ok. [#18920](https://github.com/grafana/grafana/pull/18920), [@papagian](https://github.com/papagian)
+* **Alerting**: fix duplicate alert states when the alert fails to save to the database. [#18216](https://github.com/grafana/grafana/pull/18216), [@kylebrandt](https://github.com/kylebrandt)
+* **Alerting**: fix response popover prompt when add notification channels. [#18967](https://github.com/grafana/grafana/pull/18967), [@lzdw](https://github.com/lzdw)
+* **CloudWatch**: Fix alerting for queries with Id (using GetMetricData). [#17899](https://github.com/grafana/grafana/pull/17899), [@alex-berger](https://github.com/alex-berger)
+* **Explore**: Fix auto completion on label values for Loki. [#18988](https://github.com/grafana/grafana/pull/18988), [@aocenas](https://github.com/aocenas)
+* **Explore**: Fixes crash using back button with a zoomed in graph. [#19122](https://github.com/grafana/grafana/pull/19122), [@hugohaggmark](https://github.com/hugohaggmark)
+* **Explore**: Fixes so queries in Explore are only run if Graph/Table is shown. [#19000](https://github.com/grafana/grafana/pull/19000), [@hugohaggmark](https://github.com/hugohaggmark)
+* **MSSQL**: Change connectionstring to URL format to fix using passwords with semicolon. [#18384](https://github.com/grafana/grafana/pull/18384), [@Russiancold](https://github.com/Russiancold)
+* **MSSQL**: Fix memory leak when debug enabled. [#19049](https://github.com/grafana/grafana/pull/19049), [@briangann](https://github.com/briangann)
+* **Provisioning**: Allow escaping literal '$' with '$$' in configs to avoid interpolation. [#18045](https://github.com/grafana/grafana/pull/18045), [@kylebrandt](https://github.com/kylebrandt)
+* **TimePicker**: Fixes hiding time picker dropdown in FireFox. [#19154](https://github.com/grafana/grafana/pull/19154), [@hugohaggmark](https://github.com/hugohaggmark)
+
+## Breaking changes
+
+### Annotations
+
+There are some breaking changes in the annotations HTTP API for region annotations. Region annotations are now represented
+using a single event instead of two seperate events. Check breaking changes in HTTP API [below](#http-api) and [HTTP API documentation](https://grafana.com/docs/http_api/annotations/) for more details.
+
+### Docker
+
+Grafana is now using Alpine 3.10 as docker base image.
+
+### HTTP API
+  - `GET /api/alert-notifications` now requires at least editor access. New `/api/alert-notifications/lookup` returns less information than `/api/alert-notifications` and can be access by any authenticated user.
+  - `GET /api/alert-notifiers` now requires at least editor access
+  - `GET /api/org/users` now requires org admin role. New `/api/org/users/lookup` returns less information than `/api/org/users` and can be access by users that are org admins, admin in any folder or admin of any team.
+  - `GET /api/annotations` no longer returns `regionId` property.
+  - `POST /api/annotations` no longer supports `isRegion` property.
+  - `PUT /api/annotations/:id` no longer supports `isRegion` property.
+  - `PATCH /api/annotations/:id` no longer supports `isRegion` property.
+  - `DELETE /api/annotations/region/:id` has been removed.
+
+## Deprecation notes
+
+### PhantomJS
+
+[PhantomJS](https://phantomjs.org/), which is used for rendering images of dashboards and panels, is deprecated and will be removed in a future Grafana release. A deprecation warning will from now on be logged when Grafana starts up if PhantomJS is in use.
 
-* **Annotations**: There are some breaking changes in the annotations HTTP API for region annotations. Region
-    annotations are now represented using a single event instead of two seperate events. Check HTTP docs for more details.
+Please consider migrating from PhantomJS to the [Grafana Image Renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer).
 
 # 6.3.5 (2019-09-02)
 

CONTRIBUTING.md

@@ -3,27 +3,27 @@
 Grafana uses GitHub to manage contributions.
 Contributions take the form of pull requests that will be reviewed by the core team.
 
-- If you are a new contributor see: [Steps to Contribute](#steps-to-contribute)
+- If you are a new contributor see: [Steps to Contribute](#steps-to-contribute).
 
 - If you have a trivial fix or improvement, go ahead and create a pull request.
 
 - If you plan to do something more involved, discuss your idea on the respective [issue](https://github.com/grafana/grafana/issues) or create a [new issue](https://github.com/grafana/grafana/issues/new) if it does not exist. This will avoid unnecessary work and surely give you and us a good deal of inspiration.
 
 - Sign our [CLA](http://docs.grafana.org/contribute/cla/).
 
-- Make sure to follow the code style guides
+- Make sure to follow the code style guides:
   - [Backend](https://github.com/grafana/grafana/tree/master/pkg)
   - [Frontend](https://github.com/grafana/grafana/tree/master/style_guides)
 
-## Steps to Contribute
+## Steps to contribute
 
 Should you wish to work on a GitHub issue, check first if it is not already assigned to someone. If it is free, you claim it by commenting on the issue that you want to work on it. This is to prevent duplicated efforts from contributors on the same issue.
 
 Please check the [`beginner friendly`](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22) and [`help wanted`](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) labels to find issues that are good for getting started. If you have questions about one of the issues, with or without the tag, please comment on them and one of the core team or the original poster will clarify it.
 
-To setup a local development environment we recommend reading [Building Grafana from source](http://docs.grafana.org/project/building_from_source/)
+To setup a local development environment we recommend reading [Building Grafana from source](http://docs.grafana.org/project/building_from_source/).
 
-## Pull Request Checklist
+## Pull request checklist
 
 Whether you are contributing or doing code review, first read and understand https://google.github.io/eng-practices/review/reviewer/ for general engineering practices around code reviews that we also use.
 
@@ -33,46 +33,46 @@ Whether you are contributing or doing code review, first read and understand htt
 
 - Add tests relevant to the fixed bug or new feature.
 
-### High level checks
+### High-level checks
 
 - [ ] The pull request adds value and the impact of the change is in line with [Backend](https://github.com/grafana/grafana/tree/master/pkg) or [Frontend](https://github.com/grafana/grafana/tree/master/style_guides).
 - [ ] The pull request works the way it says it should do.
 - [ ] The pull request closes one issue if possible and does not fix unrelated issues within the same pull request.
 - [ ] The pull request contains necessary tests.
 
-### Low level checks
+### Low-level checks
 
-- [ ] The pull request contains a title that explains it. It follows [PR and commit messages guidelines](#Pull-Requests-titles-and-message)
-- [ ] The pull request contains necessary link(s) to issue(s). 
-- [ ] The pull request contains commits with messages that are small and understandable. It follows [PR and commit messages guidelines](#Pull-Requests-titles-and-message)
+- [ ] The pull request contains a title that explains it. It follows [PR and commit messages guidelines](#Pull-Requests-titles-and-message).
+- [ ] The pull request contains necessary links to issues. 
+- [ ] The pull request contains commits with messages that are small and understandable. It follows [PR and commit messages guidelines](#Pull-Requests-titles-and-message).
 - [ ] The pull request does not contain magic strings or numbers that could be replaced with an `Enum` or `const` instead.
 
-#### Bug specific checks
+#### Bug-specific checks
 
 - [ ] The pull request contains `Closes: #Issue` or `Fixes: #Issue` in pull request description.
 - [ ] The Pull Request adds tests that replicate the fixed bug and helps avoid regressions.
 
-### Frontend specific checks
+### Frontend-specific checks
 
 - [ ] The pull request does not increase the Angular code base.
   > We are in the process of migrating to React so any increment of Angular code is generally discouraged.
 - [ ] The pull request does not contain uses of `any` or `{}` without comments describing why.
 - [ ] The pull request does not contain large React components that could easily be split into several smaller components.
 - [ ] The pull request does not contain back end calls directly from components, use actions and Redux instead.
 
-#### Redux specific checks (skip if pull request does not contain Redux changes)
+#### Redux specific checks (skip if your pull request does not contain Redux changes)
 
 - [ ] The pull request does not contain code that mutates state in reducers or thunks.
 - [ ] The pull request uses helpers `actionCreatorFactory` and `reducerFactory` instead of traditional `switch statement` reducers in Redux. See [Redux framework](https://github.com/grafana/grafana/tree/master/style_guides/redux.md) for more details.
 - [ ] The pull request uses `reducerTester` to test reducers. See [Redux framework](https://github.com/grafana/grafana/tree/master/style_guides/redux.md) for more details.
 - [ ] The pull request does not contain code that accesses the reducers state slice directly, instead, the code uses state selectors to access state.
 
-### Pull Requests titles and message
+### Pull request titles and message
 
 Pull request titles should follow this format: `Area: Name of the change`.
 Titles are used to generate the changelog so they should be as descriptive as possible in one line.
 
-Good Examples
+Good examples:
 
 - `Explore: Adds Live option for supported datasources`
 - `GraphPanel: Don't sort series when legend table & sort column is not visible`
@@ -87,7 +87,7 @@ The commit message of the commits in the Pull Request can still be part of the g
 
 The Git commit title should be short, descriptive and include the Pull Request ID.
 
-Good Examples
+Good examples:
 
 - `Explore: Live supprt in datasources (#12345)`
 - `GraphPanel: Fix legend sorting issues (#12345)`

ISSUE_TRIAGE.md

@@ -183,6 +183,8 @@ If the author does not respond to the requested information within the timespan
 
 When you feel you have all the information needed you're ready to [categorizing the issue](#3-categorizing-an-issue).
 
+If you receive a notification with additional information provided but you are not anymore on issue triage and you feel you do not have time to handle it, you should delegate it to the current person on issue triage.
+
 ## 3. Categorizing an issue
 
 An issue can have multiple of the following labels. Typically, a properly categorized issue should at least have: