resolve conflicts (#50184)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

docs/sources/administration/provisioning.md

@@ -98,8 +98,6 @@ datasources:
     uid: my_unique_uid
     # <string> url
     url: http://localhost:8080
-    # <string> Deprecated, use secureJsonData.password
-    password:
     # <string> database user, if used
     user:
     # <string> database name, if used
@@ -108,8 +106,6 @@ datasources:
     basicAuth:
     # <string> basic auth username
     basicAuthUser:
-    # <string> Deprecated, use secureJsonData.basicAuthPassword
-    basicAuthPassword:
     # <bool> enable/disable with credentials headers
     withCredentials:
     # <bool> mark as default datasource. Max one per org

docs/sources/datasources/alertmanager.md

@@ -37,5 +37,6 @@ datasources:
     # optionally
     basicAuth: true
     basicAuthUser: my_user
-    basicAuthPassword: test_password
+    secureJsonData:
+      basicAuthPassword: test_password
 ```

docs/sources/datasources/loki.md

@@ -255,7 +255,6 @@ datasources:
     url: http://localhost:3100
     basicAuth: true
     basicAuthUser: my_user
-    basicAuthPassword: test_password
     jsonData:
       maxLines: 1000
       derivedFields:
@@ -272,6 +271,8 @@ datasources:
         - matcherRegex: "traceID=(\\w+)"
           name: TraceID
           url: 'http://localhost:16686/trace/$${__value.raw}'
+    secureJsonData:
+      basicAuthPassword: test_password
 ```
 
 Here's an example of a Jaeger data source corresponding to the above example. Note that the Jaeger `uid` value does match the Loki `datasourceUid` value.