v1.0.9

templates/ldap.toml.j2

@@ -1,6 +1,6 @@
 [[servers]]
 # Ldap server host (specify multiple hosts space separated)
-host = "openldap.auth.svc.cluster.local"
+host = "openldap.openldap.svc.cluster.local"
 # Default port is 389 or 636 if use_ssl = true
 port = 389
 # Set to true if LDAP server should use an encrypted TLS connection (either with STARTTLS or LDAPS)
@@ -25,7 +25,7 @@ ssl_skip_verify = false
 bind_dn = "cn=readonly,dc=eom,dc=dev"
 # Search user bind password
 # If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
-bind_password = "{{ ldap_readonly_password }}"
+bind_password = "{{ openldap_readonly_password }}"
 # We recommend using variable expansion for the bind_password, for more info https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#variable-expansion
 # bind_password = '$__env{LDAP_BIND_PASSWORD}'
 
@@ -34,30 +34,31 @@ timeout = 30
 
 # User search filter, for example "(cn=%s)" or "(sAMAccountName=%s)" or "(uid=%s)"
 # Allow login from email or username, example "(|(sAMAccountName=%s)(userPrincipalName=%s))"
-search_filter = "(&(objectClass=inetOrgPerson)(objectClass=posixAccount)(uid=%s))"
+search_filter = "(&(objectClass=posixAccount)(uid=%s)(memberOf=cn=Grafana Users,ou=Grafana,ou=Services,dc=eom,dc=dev))"
 
 # An array of base dns to search through
 search_base_dns = ["dc=eom,dc=dev"]
 
-group_search_filter = "(&(objectClass=posixGroup)(memberUid=%s))"
-group_search_filter_user_attribute = "uid"
-group_search_base_dns = ["dc=eom,dc=dev"]
-
 # Specify names of the LDAP attributes your LDAP uses
 [servers.attributes]
 username = "uid"
 email =  "mail"
 name = "givenName"
 surname = "sn"
+member_of = "memberOf"
+
+[[servers.group_mappings]]
+group_dn = "cn=Grafana Administrators,ou=Grafana,ou=Services,dc=eom,dc=dev"
+org_id = 1
+org_role = "Admin"
+grafana_admin = true
+
+[[servers.group_mappings]]
+group_dn = "cn=Grafana Users,ou=Grafana,ou=Services,dc=eom,dc=dev"
+org_id = 1
+org_role = "Viewer"
 
 [[servers.group_mappings]]
 group_dn = "cn=DevOps Owners,ou=DevOps,ou=Organizations,dc=eom,dc=dev"
 org_id = 2
 org_role = "Admin"
-grafana_admin = true
-
-[[servers.group_mappings]]
-group_dn = "cn=DevOps Members,ou=DevOps,ou=Organizations,dc=eom,dc=dev"
-org_id = 2
-org_role = "Viewer"
-grafana_admin = true