From 57f2d98418cadc15d82da7f45785a067db1e0c84 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Tue, 8 May 2018 09:26:28 +0200 Subject: [PATCH 1/3] decrease length of auth_id column in user_auth table certain mysql versions don't support having indices with a greater varchar length than 190. (cherry picked from commit 8ed79d614b1a39ca6b32d01245f1ad537ea99ccd) --- pkg/services/sqlstore/migrations/user_auth_mig.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/services/sqlstore/migrations/user_auth_mig.go b/pkg/services/sqlstore/migrations/user_auth_mig.go index be4d112f6f605..953883376c3c9 100644 --- a/pkg/services/sqlstore/migrations/user_auth_mig.go +++ b/pkg/services/sqlstore/migrations/user_auth_mig.go @@ -22,8 +22,8 @@ func addUserAuthMigrations(mg *Migrator) { // add indices addTableIndicesMigrations(mg, "v1", userAuthV1) - mg.AddMigration("alter user_auth.auth_id to length 255", new(RawSqlMigration). + mg.AddMigration("alter user_auth.auth_id to length 190", new(RawSqlMigration). Sqlite("SELECT 0 WHERE 0;"). - Postgres("ALTER TABLE user_auth ALTER COLUMN auth_id TYPE VARCHAR(255);"). - Mysql("ALTER TABLE user_auth MODIFY auth_id VARCHAR(255);")) + Postgres("ALTER TABLE user_auth ALTER COLUMN auth_id TYPE VARCHAR(190);"). + Mysql("ALTER TABLE user_auth MODIFY auth_id VARCHAR(190);")) } From a41e346a0bb83f8ec022e981bf3df6ab40050247 Mon Sep 17 00:00:00 2001 From: Dan Cech Date: Thu, 19 Apr 2018 11:39:13 -0400 Subject: [PATCH 2/3] allow analytics.js to be cached, enable anonymizeIP setting (cherry picked from commit ab589da5344588290588ff08b631a3ee696976f9) --- public/app/core/services/analytics.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/public/app/core/services/analytics.ts b/public/app/core/services/analytics.ts index 4f9994302abbc..d1998f44cbc23 100644 --- a/public/app/core/services/analytics.ts +++ b/public/app/core/services/analytics.ts @@ -19,6 +19,7 @@ export class Analytics { }); ga.l = +new Date(); ga('create', (config).googleAnalyticsId, 'auto'); + ga('set', 'anonymizeIp', true); return ga; } From 92a8b0871e754683e52df29c9a28e2eb8c7412e2 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Wed, 9 May 2018 10:50:04 +0200 Subject: [PATCH 3/3] 5.1.2 release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 980f69380f2e8..f085f0827267b 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "company": "Grafana Labs" }, "name": "grafana", - "version": "5.1.1", + "version": "5.1.2", "repository": { "type": "git", "url": "http://github.com/grafana/grafana.git"