Skip to content

Commit b565bd1

Browse files
committed
feat(ui): add backward compatibility to stackdriver log url
1 parent db90234 commit b565bd1

File tree

1 file changed

+54
-20
lines changed

1 file changed

+54
-20
lines changed

ui/src/components/logs/ContainerLogsView.js

Lines changed: 54 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { useMerlinApi } from "../../hooks/useMerlinApi";
1818
import mocks from "../../mocks";
1919
import { LogsSearchBar } from "./LogsSearchBar";
2020
import {createLogImageBuilderUrl, createLogModelUrl} from "../../utils/createLogUrl";
21+
import {createStackdriverUrl} from "../../utils/createStackdriverUrl";
2122

2223
const componentOrder = [
2324
"image_builder",
@@ -126,16 +127,31 @@ export const ContainerLogsView = ({
126127
() => {
127128
if (projectLoaded) {
128129
// set image builder url
129-
setPodLogUrls({
130-
...podLogUrls,
131-
image_builder: createLogImageBuilderUrl(
132-
featureToggleConfig.logImageBuilderURL,
133-
appConfig.imagebuilder.cluster,
134-
appConfig.imagebuilder.namespace,
135-
project.name + "-" + model.name + "-" + versionId,
136-
model.updated_at,
137-
),
138-
});
130+
if (featureToggleConfig.logImageBuilderURL) {
131+
setPodLogUrls({
132+
...podLogUrls,
133+
image_builder: createLogImageBuilderUrl(
134+
featureToggleConfig.logImageBuilderURL,
135+
appConfig.imagebuilder.cluster,
136+
appConfig.imagebuilder.namespace,
137+
project.name + "-" + model.name + "-" + versionId,
138+
model.updated_at,
139+
),
140+
});
141+
} else {
142+
// backward compatible to stackdriver
143+
let stackdriverQuery = {
144+
job_name: project.name + "-" + model.name + "-" + versionId,
145+
start_time: model.updated_at,
146+
};
147+
setPodLogUrls({
148+
...podLogUrls,
149+
image_builder: createStackdriverUrl(
150+
stackdriverQuery,
151+
"image_builder",
152+
),
153+
});
154+
}
139155

140156
// update active container
141157
if (params.component_type !== "") {
@@ -169,16 +185,34 @@ export const ContainerLogsView = ({
169185
];
170186

171187
if (params.component_type !== "image_builder") {
172-
setPodLogUrls({
173-
...podLogUrls,
174-
[params.component_type]: createLogModelUrl(
175-
featureToggleConfig.logModelURL,
176-
activeContainers[0].cluster,
177-
activeContainers[0].namespace,
178-
pods,
179-
model.updated_at,
180-
),
181-
});
188+
if (featureToggleConfig.logModelURL) {
189+
setPodLogUrls({
190+
...podLogUrls,
191+
[params.component_type]: createLogModelUrl(
192+
featureToggleConfig.logModelURL,
193+
activeContainers[0].cluster,
194+
activeContainers[0].namespace,
195+
pods,
196+
model.updated_at,
197+
),
198+
});
199+
} else {
200+
// backward compatible to stackdriver
201+
let stackdriverQuery = {
202+
gcp_project: activeContainers[0].gcp_project,
203+
cluster: activeContainers[0].cluster,
204+
namespace: activeContainers[0].namespace,
205+
pod_name: pods.map(pod => `"${pod}"`).join(" OR "),
206+
start_time: model.updated_at,
207+
};
208+
setPodLogUrls({
209+
...podLogUrls,
210+
[params.component_type]: createStackdriverUrl(
211+
stackdriverQuery,
212+
params.component_type,
213+
),
214+
});
215+
}
182216
}
183217
}
184218
}

0 commit comments

Comments
 (0)