resolve conflicts (#50184)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2022-06-03 18:03:45 +02:00
parent fc4018048e
commit d4fde160a1
33 changed files with 274 additions and 450 deletions
@@ -6,12 +6,10 @@ datasources:
    access: proxy
    orgId: 2
    url: url
-    password: password
    user: user
    database: database
    basicAuth: true
    basicAuthUser: basic_auth_user
-    basicAuthPassword: basic_auth_password
    withCredentials: true
    isDefault: true
    jsonData:
@@ -9,12 +9,10 @@ apiVersion: 1
 #    access: proxy
 #    orgId: 2
 #    url: url
-#    password: password
 #    user: user
 #    database: database
 #    basicAuth: true
 #    basicAuthUser: basic_auth_user
-#    basicAuthPassword: basic_auth_password
 #    withCredentials: true
 #    jsonData:
 #      graphiteVersion: "1.1"