From 3b452ab597f3714d54c156e12237f8991107315d Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Mon, 6 Jul 2020 16:39:43 -0400
Subject: [PATCH] Change grafana to use anon auth

---
 salt/grafana/etc/grafana.ini              | 6 +++---
 salt/nginx/etc/nginx.conf.so-eval         | 1 +
 salt/nginx/etc/nginx.conf.so-master       | 1 +
 salt/nginx/etc/nginx.conf.so-mastersearch | 1 +
 salt/nginx/etc/nginx.conf.so-standalone   | 1 +
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/salt/grafana/etc/grafana.ini b/salt/grafana/etc/grafana.ini
index 0327b8bc5..3486ff241 100644
--- a/salt/grafana/etc/grafana.ini
+++ b/salt/grafana/etc/grafana.ini
@@ -226,13 +226,13 @@ log_queries =
 #################################### Anonymous Auth ##########################
 [auth.anonymous]
 # enable anonymous access
-;enabled = false
+enabled = true
 
 # specify organization name that should be used for unauthenticated users
-;org_name = Main Org.
+org_name = Main Org.
 
 # specify role for unauthenticated users
-;org_role = Viewer
+org_role = Viewer
 
 #################################### Github Auth ##########################
 [auth.github]
diff --git a/salt/nginx/etc/nginx.conf.so-eval b/salt/nginx/etc/nginx.conf.so-eval
index 49ba4b2ef..7e3a9a401 100644
--- a/salt/nginx/etc/nginx.conf.so-eval
+++ b/salt/nginx/etc/nginx.conf.so-eval
@@ -183,6 +183,7 @@ http {
 		} 
 		
 		location /grafana/ {
+			auth_request          /auth/sessions/whoami;
 			rewrite               /grafana/(.*) /$1 break;
 			proxy_pass            http://{{ masterip }}:3000/;
 			proxy_read_timeout    90;
diff --git a/salt/nginx/etc/nginx.conf.so-master b/salt/nginx/etc/nginx.conf.so-master
index 34b5ea9cd..de3a3a6c1 100644
--- a/salt/nginx/etc/nginx.conf.so-master
+++ b/salt/nginx/etc/nginx.conf.so-master
@@ -183,6 +183,7 @@ http {
 		} 
 		
 		location /grafana/ {
+			auth_request          /auth/sessions/whoami;
 			rewrite               /grafana/(.*) /$1 break;
 			proxy_pass            http://{{ masterip }}:3000/;
 			proxy_read_timeout    90;
diff --git a/salt/nginx/etc/nginx.conf.so-mastersearch b/salt/nginx/etc/nginx.conf.so-mastersearch
index 7c8f8ff5d..952f18cd9 100644
--- a/salt/nginx/etc/nginx.conf.so-mastersearch
+++ b/salt/nginx/etc/nginx.conf.so-mastersearch
@@ -182,6 +182,7 @@ http {
 		} 
 		
 		location /grafana/ {
+			auth_request          /auth/sessions/whoami;
 			rewrite               /grafana/(.*) /$1 break;
 			proxy_pass            http://{{ masterip }}:3000/;
 			proxy_read_timeout    90;
diff --git a/salt/nginx/etc/nginx.conf.so-standalone b/salt/nginx/etc/nginx.conf.so-standalone
index 34b5ea9cd..de3a3a6c1 100644
--- a/salt/nginx/etc/nginx.conf.so-standalone
+++ b/salt/nginx/etc/nginx.conf.so-standalone
@@ -183,6 +183,7 @@ http {
 		} 
 		
 		location /grafana/ {
+			auth_request          /auth/sessions/whoami;
 			rewrite               /grafana/(.*) /$1 break;
 			proxy_pass            http://{{ masterip }}:3000/;
 			proxy_read_timeout    90;