diff --git a/package.json b/package.json index 980f69380f2..f085f082726 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" diff --git a/pkg/services/sqlstore/migrations/user_auth_mig.go b/pkg/services/sqlstore/migrations/user_auth_mig.go index be4d112f6f6..953883376c3 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);")) } diff --git a/public/app/core/services/analytics.ts b/public/app/core/services/analytics.ts index 4f9994302ab..d1998f44cbc 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; }