fix tests

e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/datasourceConfigPage.spec.ts

@@ -24,17 +24,17 @@ test.describe('test createDataSourceConfigPage fixture, saveAndTest and toBeOK m
 });
 
 test.describe('test data source with frontend only health check', () => {
-  test('valid credentials should display a success alert on the page', async ({
+  test.skip('valid credentials should display a success alert on the page', async ({
     createDataSourceConfigPage,
     page,
     selectors,
   }) => {
-    const configPage = await createDataSourceConfigPage({ type: 'jaeger' });
-    const healthCheckPath = `${selectors.apis.DataSource.proxy(configPage.datasource.uid)}/api/services`;
+    const configPage = await createDataSourceConfigPage({ type: 'zipkin' });
+    const healthCheckPath = `${selectors.apis.DataSource.proxy(configPage.datasource.uid)}/api/v2/services`;
     await page.route(healthCheckPath, async (route) => {
       await route.fulfill({ status: 200, body: 'OK' });
     });
-    await page.getByPlaceholder('http://localhost:16686').fill('http://localhost:16686');
+    await page.getByPlaceholder('http://localhost:9411').fill('http://localhost:9411');
     await expect(configPage.saveAndTest({ path: healthCheckPath })).toBeOK();
     await expect(
       configPage,

pkg/tsdb/zipkin/handler_checkhealth.go

@@ -23,14 +23,14 @@ func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthReque
 			Message: err.Error(),
 		}, nil
 	}
-	if res.StatusCode == http.StatusOK {
+	if res.StatusCode != http.StatusOK {
 		return &backend.CheckHealthResult{
-			Status:  backend.HealthStatusOk,
-			Message: "Data source is working",
+			Status:  backend.HealthStatusError,
+			Message: fmt.Sprintf("invalid response from zipkin with status code %d", res.StatusCode),
 		}, nil
 	}
 	return &backend.CheckHealthResult{
-		Status:  backend.HealthStatusError,
-		Message: fmt.Sprintf("invalid response from zipkin URL with status code %d", res.StatusCode),
+		Status:  backend.HealthStatusOk,
+		Message: "Data source is working",
 	}, nil
 }

public/app/plugins/datasource/zipkin/QueryField.test.tsx

@@ -28,8 +28,8 @@ describe('QueryField', () => {
 describe('useServices', () => {
   it('returns services from datasource', async () => {
     const ds = {
-      async metadataRequest(url) {
-        if (url === '/api/v2/services') {
+      async getResource(url = 'services') {
+        if (url === 'services') {
           return Promise.resolve(['service1', 'service2']);
         }
         return undefined;
@@ -49,12 +49,12 @@ describe('useServices', () => {
 describe('useLoadOptions', () => {
   it('loads spans and traces', async () => {
     const ds = {
-      async metadataRequest(url, params) {
-        if (url === '/api/v2/spans' && params?.serviceName === 'service1') {
+      async getResource(url, params) {
+        if (url === 'spans' && params?.serviceName === 'service1') {
           return Promise.resolve(['span1', 'span2']);
         }
 
-        if (url === '/api/v2/traces' && params?.serviceName === 'service1' && params?.spanName === 'span1') {
+        if (url === 'traces' && params?.serviceName === 'service1' && params?.spanName === 'span1') {
           return Promise.resolve([[{ name: 'trace1', duration: 10_000, traceId: 'traceId1' }]]);
         }
         return undefined;