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

…uery

* grafana/master:
  MySQL: Limit datasource error details returned from the backend (grafana#19373)
  MySQL, Postgres: Update raw sql when query builder updates (grafana#19209)
  MySQL, Postgres, MSSQL: Fix validating query with template variables in alert  (grafana#19237)
  Explore: Do not send explicit maxDataPoints for logs. (grafana#19235)
  grafana/ui: Add Timezone picker (grafana#19364)
  Heatmap: use DataFrame rather than LegacyResponseData (grafana#19026)
  Explore: Refactor mode selection (grafana#19356)
  Dashboard: Fix export for sharing when panels use default data source (grafana#19315)
  Azure Monitor: Revert support for cross resource queries (grafana#19115)" (grafana#19346)
  grafana/ui: Add electrical units mAh and kAh (grafana#19314)
  grafana/ui: Add Indian Rupee (INR) to currencies (grafana#19201)
  Chore: Bump typescript to version 3.6.3 (grafana#19308)
  Explore: Refactor live tail controls (grafana#19328)
  Docs: Documentation for return-to-dashboard feature (grafana#19198)
  Select: Set placeholder color (grafana#19309)
  Keybindings: Improve esc / exit / blur logic (grafana#19320)
  Plugins: Skips existence of module.js for renderer plugins (grafana#19318)
  Explore: Fix unsubscribing from Loki websocket (grafana#19263)

docs/sources/features/explore/index.md

@@ -115,3 +115,19 @@ after switching to the Logs data source, the query changes to:
 `{job="grafana"}`
 
 This will return a chunk of logs in the selected time range that can be grepped/text searched.
+
+## Navigating between Explore and a dashboard
+
+To help accelerate workflows that involve regularly switching from Explore to a dashboard and vice-versa, we've added the ability to return to the origin dashboard
+after navigating to Explore from the panel's dropdown.
+
+{{< docs-imagebox img="/img/docs/v64/panel_dropdown.png" class="docs-image--no-shadow" caption="Screenshot of the panel dropdown" >}}
+
+After you've navigated to Explore, you should notice a "Back" button in the Explore toolbar.
+
+{{< docs-imagebox img="/img/docs/v64/explore_toolbar.png" class="docs-image--no-shadow" caption="Screenshot of the explore toolbar" >}}
+
+Simply clicking the button will return you to the origin dashboard, or, if you'd like to bring changes you make in Explore back to the dashboard, simply click
+the arrow next to the button to reveal a "Return to panel with changes" menu item.
+
+{{< docs-imagebox img="/img/docs/v64/explore_return_dropdown.png" class="docs-image--no-shadow" caption="Screenshot of the expanded explore return dropdown" >}}

package.json

@@ -123,19 +123,20 @@
     "redux-mock-store": "1.5.3",
     "regexp-replace-loader": "1.0.1",
     "rimraf": "2.6.3",
+    "rxjs-spy": "^7.5.1",
     "sass-lint": "1.12.1",
     "sass-loader": "7.1.0",
     "sinon": "1.17.6",
     "style-loader": "0.23.1",
     "terser-webpack-plugin": "1.2.3",
-    "ts-jest": "24.0.2",
-    "ts-loader": "6.0.4",
-    "ts-node": "8.1.0",
-    "tslib": "1.9.3",
-    "tslint": "5.14.0",
+    "ts-jest": "24.1.0",
+    "ts-loader": "6.1.1",
+    "ts-node": "8.4.1",
+    "tslib": "1.10.0",
+    "tslint": "5.20.0",
     "tslint-loader": "3.5.4",
-    "tslint-react": "3.6.0",
-    "typescript": "3.5.3",
+    "tslint-react": "4.1.0",
+    "typescript": "3.6.3",
     "webpack": "4.29.6",
     "webpack-bundle-analyzer": "3.3.2",
     "webpack-cleanup-plugin": "0.5.1",

packages/grafana-data/package.json

@@ -38,7 +38,7 @@
     "rollup-plugin-typescript2": "0.19.3",
     "rollup-plugin-visualizer": "0.9.2",
     "sinon": "1.17.6",
-    "typescript": "3.5.3"
+    "typescript": "3.6.3"
   },
   "types": "src/index.ts"
 }

packages/grafana-data/src/datetime/index.ts

@@ -2,4 +2,5 @@
 import * as dateMath from './datemath';
 import * as rangeUtil from './rangeutil';
 export * from './moment_wrapper';
+export * from './timezones';
 export { dateMath, rangeUtil };