diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3befbc40eb8..aed25afb02e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,7 @@ om/grafana/grafana/issues/12668)
* **InfluxDB**: Support timeFilter in query templating for InfluxDB [#12598](https://github.com/grafana/grafana/pull/12598), thx [kichristensen](https://github.com/kichristensen)
* **Provisioning**: Should allow one default datasource per organisation [#12229](https://github.com/grafana/grafana/issues/12229)
* **Heatmap**: Fix broken tooltip and crosshair on Firefox [#12486](https://github.com/grafana/grafana/issues/12486)
+* **Login**: Show loading animation while waiting for authentication response on login [#12865](https://github.com/grafana/grafana/issues/12865)
### Breaking changes
@@ -72,6 +73,12 @@ These are new features that's still being worked on and are in an experimental p
* **Frontend**: Convert all Frontend Karma tests to Jest tests [#12224](https://github.com/grafana/grafana/issues/12224)
+# 5.2.3 (2018-08-29)
+
+### Important fix for LDAP & OAuth login vulnerability
+
+See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-6-4-security-update/10050) for details.
+
# 5.2.2 (2018-07-25)
### Minor
@@ -440,6 +447,12 @@ The following properties have been deprecated and will be removed in a future re
- `uri` property in `GET /api/search` -> Use new `url` or `uid` property instead
- `meta.slug` property in `GET /api/dashboards/uid/:uid` and `GET /api/dashboards/db/:slug` -> Use new `meta.url` or `dashboard.uid` property instead
+# 4.6.4 (2018-08-29)
+
+### Important fix for LDAP & OAuth login vulnerability
+
+See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-6-4-security-update/10050) for details.
+
# 4.6.3 (2017-12-14)
## Fixes
diff --git a/docs/sources/administration/provisioning.md b/docs/sources/administration/provisioning.md
index 7fff41fb805..c57fb1683f0 100644
--- a/docs/sources/administration/provisioning.md
+++ b/docs/sources/administration/provisioning.md
@@ -155,7 +155,7 @@ Since not all datasources have the same configuration settings we only have the
| tlsSkipVerify | boolean | *All* | Controls whether a client verifies the server's certificate chain and host name. |
| graphiteVersion | string | Graphite | Graphite version |
| timeInterval | string | Elastic, InfluxDB & Prometheus | Lowest interval/step value that should be used for this data source |
-| esVersion | string | Elastic | Elasticsearch version as an number (2/5/56) |
+| esVersion | number | Elastic | Elasticsearch version as an number (2/5/56) |
| timeField | string | Elastic | Which field that should be used as timestamp |
| interval | string | Elastic | Index date time format |
| authType | string | Cloudwatch | Auth provider. keys/credentials/arn |
diff --git a/docs/sources/guides/getting_started.md b/docs/sources/guides/getting_started.md
index f724504156f..a27c6ca4c99 100644
--- a/docs/sources/guides/getting_started.md
+++ b/docs/sources/guides/getting_started.md
@@ -13,7 +13,35 @@ weight = 1
# Getting started
-This guide will help you get started and acquainted with Grafana. It assumes you have a working Grafana server up and running and have added at least one [Data Source](/features/datasources/).
+This guide will help you get started and acquainted with Grafana. It assumes you have a working Grafana server up and running. If not please read the [installation guide](/installation/).
+
+## Logging in for the first time
+
+To run Grafana open your browser and go to http://localhost:3000/. 3000 is the default http port that Grafana listens to if you haven't [configured a different port](/installation/configuration/#http-port).
+
+There you will see the login page. Default username is admin and default password is admin. When you log in for the first time you will be asked to change your password. We strongly encourage you to
+follow Grafana’s best practices and change the default administrator password. You can later go to user preferences and change your user name.
+
+
+## How to add a data source
+
+{{< docs-imagebox img="/img/docs/v52/sidemenu-datasource.png" max-width="250px" class="docs-image--right docs-image--no-shadow">}}
+
+Before you create your first dashboard you need to add your data source.
+
+First move your cursor to the cog on the side menu which will show you the configuration menu. If the side menu is not visible click the Grafana icon in the upper left corner. The first item on the configuration menu is data sources, click on that and you'll be taken to the data sources page where you can add and edit data sources. You can also simply click the cog.
+
+
+Click Add data source and you will come to the settings page of your new data source.
+
+{{< docs-imagebox img="/img/docs/v52/add-datasource.png" max-width="700px" class="docs-image--no-shadow">}}
+
+First, give the data source a Name and then select which Type of data source you'll want to create, see [Supported data sources](/features/datasources/#supported-data-sources/) for more information and how to configure your data source.
+
+
+{{< docs-imagebox img="/img/docs/v52/datasource-settings.png" max-width="700px" class="docs-image--no-shadow">}}
+
+After you have configuered your data source you are ready to save and test.
## Beginner guides
diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md
index 4b14829b689..3394dfe16bc 100644
--- a/docs/sources/installation/configuration.md
+++ b/docs/sources/installation/configuration.md
@@ -266,7 +266,8 @@ The number of days the keep me logged in / remember me cookie lasts.
### secret_key
-Used for signing keep me logged in / remember me cookies.
+Used for signing some datasource settings like secrets and passwords. Cannot be changed without requiring an update
+to datasource settings to re-encode them.
### disable_gravatar
diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md
index 4bb245a586e..13fa3440170 100644
--- a/docs/sources/installation/debian.md
+++ b/docs/sources/installation/debian.md
@@ -166,3 +166,8 @@ To configure Grafana add a configuration file named `custom.ini` to the
Start Grafana by executing `./bin/grafana-server web`. The `grafana-server`
binary needs the working directory to be the root install directory (where the
binary and the `public` folder is located).
+
+## Logging in for the first time
+
+To run Grafana open your browser and go to http://localhost:3000/. 3000 is the default http port that Grafana listens to if you haven't [configured a different port](/installation/configuration/#http-port).
+Then follow the instructions [here](/guides/getting_started/).
\ No newline at end of file
diff --git a/docs/sources/installation/docker.md b/docs/sources/installation/docker.md
index 6bf25ad8232..c71dc105ad4 100644
--- a/docs/sources/installation/docker.md
+++ b/docs/sources/installation/docker.md
@@ -217,3 +217,8 @@ chown -R root:root /etc/grafana && \
chown -R grafana:grafana /var/lib/grafana && \
chown -R grafana:grafana /usr/share/grafana
```
+
+## Logging in for the first time
+
+To run Grafana open your browser and go to http://localhost:3000/. 3000 is the default http port that Grafana listens to if you haven't [configured a different port](/installation/configuration/#http-port).
+Then follow the instructions [here](/guides/getting_started/).
\ No newline at end of file
diff --git a/docs/sources/installation/mac.md b/docs/sources/installation/mac.md
index 12ff4adaab9..fbc00c01737 100644
--- a/docs/sources/installation/mac.md
+++ b/docs/sources/installation/mac.md
@@ -92,3 +92,7 @@ Start Grafana by executing `./bin/grafana-server web`. The `grafana-server`
binary needs the working directory to be the root install directory (where the
binary and the `public` folder is located).
+## Logging in for the first time
+
+To run Grafana open your browser and go to http://localhost:3000/. 3000 is the default http port that Grafana listens to if you haven't [configured a different port](/installation/configuration/#http-port).
+Then follow the instructions [here](/guides/getting_started/).
\ No newline at end of file
diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md
index 13597b9d921..24c301c5763 100644
--- a/docs/sources/installation/rpm.md
+++ b/docs/sources/installation/rpm.md
@@ -193,3 +193,7 @@ Start Grafana by executing `./bin/grafana-server web`. The `grafana-server`
binary needs the working directory to be the root install directory (where the
binary and the `public` folder is located).
+## Logging in for the first time
+
+To run Grafana open your browser and go to http://localhost:3000/. 3000 is the default http port that Grafana listens to if you haven't [configured a different port](/installation/configuration/#http-port).
+Then follow the instructions [here](/guides/getting_started/).
\ No newline at end of file
diff --git a/docs/sources/installation/windows.md b/docs/sources/installation/windows.md
index 5dc87984512..572081a1c54 100644
--- a/docs/sources/installation/windows.md
+++ b/docs/sources/installation/windows.md
@@ -38,6 +38,11 @@ service using that tool.
Read more about the [configuration options]({{< relref "configuration.md" >}}).
+## Logging in for the first time
+
+To run Grafana open your browser and go to the port you configured above, e.g. http://localhost:8080/.
+Then follow the instructions [here](/guides/getting_started/).
+
## Building on Windows
The Grafana backend includes Sqlite3 which requires GCC to compile. So
diff --git a/docs/sources/project/building_from_source.md b/docs/sources/project/building_from_source.md
index 08673404572..64e67a22bae 100644
--- a/docs/sources/project/building_from_source.md
+++ b/docs/sources/project/building_from_source.md
@@ -141,3 +141,8 @@ Please contribute to the Grafana project and submit a pull request! Build new fe
**Problem**: On Windows, getting errors about a tool not being installed even though you just installed that tool.
**Solution**: It is usually because it got added to the path and you have to restart your command prompt to use it.
+
+## Logging in for the first time
+
+To run Grafana open your browser and go to the default port http://localhost:3000 or the port you have configured.
+Then follow the instructions [here](/guides/getting_started/).
\ No newline at end of file
diff --git a/latest.json b/latest.json
index 8e26289c856..7b36131fea2 100644
--- a/latest.json
+++ b/latest.json
@@ -1,4 +1,4 @@
{
- "stable": "5.2.0",
- "testing": "5.2.0"
+ "stable": "5.2.3",
+ "testing": "5.2.3"
}
diff --git a/public/app/core/app_events.ts b/public/app/core/app_events.ts
index 26dd74bcb00..6af7913167b 100644
--- a/public/app/core/app_events.ts
+++ b/public/app/core/app_events.ts
@@ -1,4 +1,4 @@
import { Emitter } from './utils/emitter';
-var appEvents = new Emitter();
+const appEvents = new Emitter();
export default appEvents;
diff --git a/public/app/core/components/code_editor/code_editor.ts b/public/app/core/components/code_editor/code_editor.ts
index 66aec778d73..6ae1a99f245 100644
--- a/public/app/core/components/code_editor/code_editor.ts
+++ b/public/app/core/components/code_editor/code_editor.ts
@@ -99,9 +99,9 @@ function link(scope, elem, attrs) {
if (scope.codeEditorFocus) {
setTimeout(function() {
textarea.focus();
- var domEl = textarea[0];
+ const domEl = textarea[0];
if (domEl.setSelectionRange) {
- var pos = textarea.val().length * 2;
+ const pos = textarea.val().length * 2;
domEl.setSelectionRange(pos, pos);
}
}, 100);
diff --git a/public/app/core/components/dashboard_selector.ts b/public/app/core/components/dashboard_selector.ts
index 379fd441a19..e1809f3d42c 100644
--- a/public/app/core/components/dashboard_selector.ts
+++ b/public/app/core/components/dashboard_selector.ts
@@ -1,6 +1,6 @@
import coreModule from 'app/core/core_module';
-var template = `
+const template = `
`;
diff --git a/public/app/core/components/grafana_app.ts b/public/app/core/components/grafana_app.ts
index 1f55bc332ac..b715a20e28f 100644
--- a/public/app/core/components/grafana_app.ts
+++ b/public/app/core/components/grafana_app.ts
@@ -49,7 +49,7 @@ export class GrafanaCtrl {
};
$rootScope.onAppEvent = function(name, callback, localScope) {
- var unbind = $rootScope.$on(name, callback);
+ const unbind = $rootScope.$on(name, callback);
var callerScope = this;
if (callerScope.$id === 1 && !localScope) {
console.log('warning rootScope onAppEvent called without localscope');
@@ -76,7 +76,7 @@ export function grafanaAppDirective(playlistSrv, contextSrv, $timeout, $rootScop
controller: GrafanaCtrl,
link: (scope, elem) => {
var sidemenuOpen;
- var body = $('body');
+ const body = $('body');
// see https://github.com/zenorocha/clipboard.js/issues/155
$.fn.modal.Constructor.prototype.enforceFocus = function() {};
@@ -153,7 +153,7 @@ export function grafanaAppDirective(playlistSrv, contextSrv, $timeout, $rootScop
// handle in active view state class
var lastActivity = new Date().getTime();
var activeUser = true;
- var inActiveTimeLimit = 60 * 1000;
+ const inActiveTimeLimit = 60 * 1000;
var sidemenuHidden = false;
function checkForInActiveUser() {
@@ -215,16 +215,16 @@ export function grafanaAppDirective(playlistSrv, contextSrv, $timeout, $rootScop
// handle document clicks that should hide things
body.click(function(evt) {
- var target = $(evt.target);
+ const target = $(evt.target);
if (target.parents().length === 0) {
return;
}
// for stuff that animates, slides out etc, clicking it needs to
// hide it right away
- var clickAutoHide = target.closest('[data-click-hide]');
+ const clickAutoHide = target.closest('[data-click-hide]');
if (clickAutoHide.length) {
- var clickAutoHideParent = clickAutoHide.parent();
+ const clickAutoHideParent = clickAutoHide.parent();
clickAutoHide.detach();
setTimeout(function() {
clickAutoHideParent.append(clickAutoHide);
@@ -245,7 +245,7 @@ export function grafanaAppDirective(playlistSrv, contextSrv, $timeout, $rootScop
}
// hide popovers
- var popover = elem.find('.popover');
+ const popover = elem.find('.popover');
if (popover.length > 0 && target.parents('.graph-legend').length === 0) {
popover.hide();
}
diff --git a/public/app/core/components/json_explorer/helpers.ts b/public/app/core/components/json_explorer/helpers.ts
index c445e1b0667..bc7468b3b21 100644
--- a/public/app/core/components/json_explorer/helpers.ts
+++ b/public/app/core/components/json_explorer/helpers.ts
@@ -12,7 +12,7 @@ function escapeString(str: string): string {
* Determines if a value is an object
*/
export function isObject(value: any): boolean {
- var type = typeof value;
+ const type = typeof value;
return !!value && type === 'object';
}
@@ -55,7 +55,7 @@ export function getType(object: Object): string {
* Generates inline preview for a JavaScript object based on a value
*/
export function getValuePreview(object: Object, value: string): string {
- var type = getType(object);
+ const type = getType(object);
if (type === 'null' || type === 'undefined') {
return type;
diff --git a/public/app/core/components/json_explorer/json_explorer.ts b/public/app/core/components/json_explorer/json_explorer.ts
index 790ed442d5c..779e5a93cba 100644
--- a/public/app/core/components/json_explorer/json_explorer.ts
+++ b/public/app/core/components/json_explorer/json_explorer.ts
@@ -279,7 +279,7 @@ export class JsonExplorer {
const objectWrapperSpan = createElement('span');
// get constructor name and append it to wrapper span
- var constructorName = createElement('span', 'constructor-name', this.constructorName);
+ const constructorName = createElement('span', 'constructor-name', this.constructorName);
objectWrapperSpan.appendChild(constructorName);
// if it's an array append the array specific elements like brackets and length
diff --git a/public/app/core/components/jsontree/jsontree.ts b/public/app/core/components/jsontree/jsontree.ts
index e127d7b14a9..5fbda5560b3 100644
--- a/public/app/core/components/jsontree/jsontree.ts
+++ b/public/app/core/components/jsontree/jsontree.ts
@@ -11,7 +11,7 @@ coreModule.directive('jsonTree', [
rootName: '@',
},
link: function(scope, elem) {
- var jsonExp = new JsonExplorer(scope.object, 3, {
+ const jsonExp = new JsonExplorer(scope.object, 3, {
animateOpen: true,
});
diff --git a/public/app/core/components/layout_selector/layout_selector.ts b/public/app/core/components/layout_selector/layout_selector.ts
index 91a3afea250..a28abe19251 100644
--- a/public/app/core/components/layout_selector/layout_selector.ts
+++ b/public/app/core/components/layout_selector/layout_selector.ts
@@ -1,7 +1,7 @@
import store from 'app/core/store';
import coreModule from 'app/core/core_module';
-var template = `
+const template = `