@@ -9,6 +9,7 @@ import { useLogsEmitter } from "../../../components/pod_logs_viewer/hooks/useLog
99import { createStackdriverUrl } from "../../../utils/createStackdriverUrl" ;
1010import EnsemblersContext from "../../../providers/ensemblers/context" ;
1111import EnvironmentsContext from "../../../providers/environments/context" ;
12+ import { createLogImageBuilderUrl , createLogUrl } from "../../../utils/createLogUrl" ;
1213
1314const components = [
1415 {
@@ -27,6 +28,7 @@ const components = [
2728
2829export const RouterLogsView = ( { router } ) => {
2930 const { appConfig } = useConfig ( ) ;
31+ const { imageBuilderUrl, turingUrl } = appConfig . podLogs . urlTemplates
3032
3133 const { currentProject } = useContext ( ProjectsContext ) ;
3234
@@ -38,7 +40,7 @@ export const RouterLogsView = ({ router }) => {
3840 const environment = Object . values ( environments )
3941 . find ( ( value ) => value . name === router ?. environment_name )
4042
41- const [ stackdriverUrls , setStackdriverUrls ] = useState ( { } ) ;
43+ const [ podLogUrls , setPodLogUrls ] = useState ( { } ) ;
4244
4345 useEffect ( ( ) => {
4446 replaceBreadcrumbs ( [
@@ -78,54 +80,101 @@ export const RouterLogsView = ({ router }) => {
7880 ( ) => {
7981 let urls = { }
8082 if (
81- appConfig . imagebuilder . cluster &&
82- appConfig . imagebuilder . gcp_project &&
83- appConfig . imagebuilder . namespace &&
83+ environment &&
8484 currentProject
8585 ) {
86- // set router url
87- urls [ "router" ] = createStackdriverUrl ( {
88- gcp_project : environment . gcp_project ,
89- cluster : environment . cluster ,
90- namespace : currentProject . name ,
91- pod_name : router . name + "-turing-router-" + router . config . version ,
92- start_time : router . updated_at ,
93- } , "router" )
94-
95- // set enricher url
96- if ( router . config . enricher . type === "docker" ) {
97- urls [ "enricher" ] = createStackdriverUrl ( {
86+ if ( turingUrl ) {
87+ // using new url
88+
89+ // set router url
90+ urls [ "router" ] = createLogUrl (
91+ turingUrl ,
92+ environment . cluster ,
93+ currentProject . name ,
94+ router . name + "-turing-router-" + router . config . version ,
95+ router . updated_at ,
96+ )
97+
98+ // set enricher url
99+ if ( router . config . enricher . type === "docker" ) {
100+ urls [ "enricher" ] = createLogUrl (
101+ turingUrl ,
102+ environment . cluster ,
103+ currentProject . name ,
104+ router . name + "-turing-enricher-" + router . config . version ,
105+ router . updated_at ,
106+ )
107+ }
108+
109+ // set ensembler url
110+ if ( router . config . ensembler . type === "docker" || router . config . ensembler . type === "pyfunc" ) {
111+ urls [ "ensembler" ] = createLogUrl (
112+ turingUrl ,
113+ environment . cluster ,
114+ currentProject . name ,
115+ router . name + "-turing-ensembler-" + router . config . version ,
116+ router . updated_at ,
117+ )
118+ }
119+ } else {
120+ // fallback to old url
121+
122+ // set router url
123+ urls [ "router" ] = createStackdriverUrl ( {
98124 gcp_project : environment . gcp_project ,
99125 cluster : environment . cluster ,
100126 namespace : currentProject . name ,
101- pod_name : router . name + "-turing-enricher-" + router . config . version ,
127+ pod_name : router . name + "-turing-router-" + router . config . version ,
102128 start_time : router . updated_at ,
103- } , "enricher" )
104- }
105-
106- // set ensembler url
107- if ( router . config . ensembler . type === "docker" || router . config . ensembler . type === "pyfunc" ) {
108- urls [ "ensembler" ] = createStackdriverUrl ( {
109- gcp_project : environment . gcp_project ,
110- cluster : environment . cluster ,
111- namespace : currentProject . name ,
112- pod_name : router . name + "-turing-ensembler-" + router . config . version ,
113- start_time : router . updated_at ,
114- } , "ensembler" )
129+ } , "router" )
130+
131+ // set enricher url
132+ if ( router . config . enricher . type === "docker" ) {
133+ urls [ "enricher" ] = createStackdriverUrl ( {
134+ gcp_project : environment . gcp_project ,
135+ cluster : environment . cluster ,
136+ namespace : currentProject . name ,
137+ pod_name : router . name + "-turing-enricher-" + router . config . version ,
138+ start_time : router . updated_at ,
139+ } , "enricher" )
140+ }
141+
142+ // set ensembler url
143+ if ( router . config . ensembler . type === "docker" || router . config . ensembler . type === "pyfunc" ) {
144+ urls [ "ensembler" ] = createStackdriverUrl ( {
145+ gcp_project : environment . gcp_project ,
146+ cluster : environment . cluster ,
147+ namespace : currentProject . name ,
148+ pod_name : router . name + "-turing-ensembler-" + router . config . version ,
149+ start_time : router . updated_at ,
150+ } , "ensembler" )
151+ }
115152 }
116153
117154 // set image builder url
118155 if ( router . config . ensembler . type === "pyfunc" && ensembler ) {
119- urls [ "ensembler_image_builder" ] = createStackdriverUrl ( {
120- job_name : "service-" + currentProject . name + "-" + ensembler . name ,
121- start_time : ensembler . updated_at ,
122- } , "ensembler_image_builder" )
156+ if ( imageBuilderUrl ) {
157+ // using new url
158+ urls [ "ensembler_image_builder" ] = createLogImageBuilderUrl (
159+ imageBuilderUrl ,
160+ appConfig . imagebuilder . cluster ,
161+ appConfig . imagebuilder . namespace ,
162+ "service-" + currentProject . name + "-" + ensembler . name ,
163+ ensembler . updated_at ,
164+ )
165+ } else {
166+ // fallback to old url
167+ urls [ "ensembler_image_builder" ] = createStackdriverUrl ( {
168+ job_name : "service-" + currentProject . name + "-" + ensembler . name ,
169+ start_time : ensembler . updated_at ,
170+ } , "ensembler_image_builder" )
171+ }
123172 }
124173
125- setStackdriverUrls ( urls ) ;
174+ setPodLogUrls ( urls ) ;
126175 }
127176 } ,
128- [ currentProject , ensembler , environment , router , appConfig . imagebuilder ]
177+ [ currentProject , ensembler , environment , router , appConfig . imagebuilder , turingUrl , imageBuilderUrl ]
129178 ) ;
130179
131180 return (
@@ -136,7 +185,7 @@ export const RouterLogsView = ({ router }) => {
136185 query = { query }
137186 onQueryChange = { setQuery }
138187 batchSize = { appConfig . podLogs . batchSize }
139- stackdriverUrls = { stackdriverUrls }
188+ podLogUrls = { podLogUrls }
140189 />
141190 </ ConfigSection >
142191 ) ;
0 commit comments