From e43f13bc03b6527ff1d585c1525fb16f0ff53efe Mon Sep 17 00:00:00 2001
From: Peter Holmberg <peter.hlmbrg@gmail.com>
Date: Wed, 12 Dec 2018 08:47:08 +0100
Subject: [PATCH 1/3] Check with lowercase

(cherry picked from commit 29bcdef1040fcec60a2afeb365b5c5f24a8af8c3)
---
 public/app/features/datasources/state/actions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/datasources/state/actions.ts b/public/app/features/datasources/state/actions.ts
index bb8fce8424a..50296db9031 100644
--- a/public/app/features/datasources/state/actions.ts
+++ b/public/app/features/datasources/state/actions.ts
@@ -148,7 +148,7 @@ export function loadDataSourceTypes(): ThunkResult<void> {
 export function nameExits(dataSources, name) {
   return (
     dataSources.filter(dataSource => {
-      return dataSource.name === name;
+      return dataSource.name.toLowerCase() === name.toLowerCase();
     }).length > 0
   );
 }

From ed05e9de72ad0ddf8808c1818dfde80468424165 Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Wed, 12 Dec 2018 10:42:37 +0100
Subject: [PATCH 2/3] add oauth_auto_login setting to defaults file

Making the setting configurable thru environment variable

(cherry picked from commit b9e91cab0e2205cd80396a00921d0fec534af163)
---
 conf/defaults.ini | 4 ++++
 conf/sample.ini   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 306c625d980..9f2f186a4eb 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -246,6 +246,10 @@ disable_signout_menu = false
 # URL to redirect the user to after sign out
 signout_redirect_url =
 
+# Set to true to attempt login with OAuth automatically, skipping the login screen.
+# This setting is ignored if multiple OAuth providers are configured.
+oauth_auto_login = false
+
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
diff --git a/conf/sample.ini b/conf/sample.ini
index c6b716a731d..455d32c06dc 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -223,6 +223,10 @@ log_queries =
 # URL to redirect the user to after sign out
 ;signout_redirect_url =
 
+# Set to true to attempt login with OAuth automatically, skipping the login screen.
+# This setting is ignored if multiple OAuth providers are configured.
+;oauth_auto_login = false
+
 #################################### Anonymous Auth ##########################
 [auth.anonymous]
 # enable anonymous access

From 43c0405ae14656a70219cfb30e6844c2cebfd992 Mon Sep 17 00:00:00 2001
From: Johannes Schill <johannes.schill@polyester.se>
Date: Tue, 11 Dec 2018 15:04:40 +0100
Subject: [PATCH 3/3] Filter tags select box on text input #14437

(cherry picked from commit 6bb9415b0ed88d791132941b74454fffe3d7d072)
---
 public/app/core/components/TagFilter/TagFilter.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/app/core/components/TagFilter/TagFilter.tsx b/public/app/core/components/TagFilter/TagFilter.tsx
index 6a4203f8739..004221657ef 100644
--- a/public/app/core/components/TagFilter/TagFilter.tsx
+++ b/public/app/core/components/TagFilter/TagFilter.tsx
@@ -51,6 +51,10 @@ export class TagFilter extends React.Component<Props, any> {
       getOptionLabel: i => i.label,
       value: tags,
       styles: ResetStyles,
+      filterOption: (option, searchQuery) => {
+        const regex = RegExp(searchQuery, 'i');
+        return regex.test(option.value);
+      },
       components: {
         Option: TagOption,
         IndicatorsContainer,