diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxDashboardController.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxDashboardController.groovy index a6be3b1140..caaf896e14 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxDashboardController.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxDashboardController.groovy @@ -206,6 +206,23 @@ class OpsmxDashboardController { return opsmxDashboardService.getDashboardResponse9(version, type, source, source1, source2, source3, source4, source5, source6) } + + @ApiOperation(value = "Endpoint for dashboard rest services") + @RequestMapping(value = "/{version}/{type}/{source}/{source1}/{source2}/{source3}/{source4}/{source5}/{source6}/{source7}", method = RequestMethod.GET) + Object getDashboardResponse10(@PathVariable("version") String version, + @PathVariable("type") String type, + @PathVariable("source") String source, + @PathVariable("source1") String source1, + @PathVariable("source2") String source2, + @PathVariable("source3") String source3, + @PathVariable("source4") String source4, + @PathVariable("source5") String source5, + @PathVariable("source6") String source6, + @PathVariable("source7") String source7) { + + return opsmxDashboardService.getDashboardResponse10(version, type, source, source1, source2, source3, source4, source5, source6,source7) + } + @ApiOperation(value = "Endpoint for dashboard rest services") @RequestMapping(value = "/{version}/{type}", method = RequestMethod.DELETE) Object deleteDashboardResponse(@PathVariable("version") String version, diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxOesController.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxOesController.groovy index 750ea55d9f..fff593b999 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxOesController.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxOesController.groovy @@ -503,9 +503,11 @@ class OpsmxOesController { @PathVariable("source2") String source2, @PathVariable("source3") String source3, @PathVariable("source4") String source4, - @PathVariable("source5") String source5) { + @PathVariable("source5") String source5, + @RequestParam(value = "gateIds", required = false) String gateIds + ) { - return opsmxOesService.getOesResponse8(type, source, source1, source2, source3, source4, source5) + return opsmxOesService.getOesResponse8(type, source, source1, source2, source3, source4, source5,gateIds) } @ApiOperation(value = "Endpoint for Oes rest services") diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxDashboardService.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxDashboardService.groovy index 138fb2bc21..12ee73d7f3 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxDashboardService.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxDashboardService.groovy @@ -103,6 +103,18 @@ interface OpsmxDashboardService { @Path('source5') String source5, @Path('source6') String source6) + @GET("/dashboardservice/{version}/{type}/{source}/{source1}/{source2}/{source3}/{source4}/{source5}/{source6}/{source7}") + Object getDashboardResponse10(@Path('version') String version, + @Path('type') String type, + @Path('source') String source, + @Path('source1') String source1, + @Path('source2') String source2, + @Path('source3') String source3, + @Path('source4') String source4, + @Path('source5') String source5, + @Path('source6') String source6, + @Path('source7') String source7) + @DELETE("/dashboardservice/{version}/{type}") Object deleteDashboardResponse(@Path('version') String version, @Path('type') String type) diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxOesService.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxOesService.groovy index db4d4d7331..9345cde9d4 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxOesService.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxOesService.groovy @@ -87,7 +87,8 @@ interface OpsmxOesService { @Path('source2') String source2, @Path('source3') String source3, @Path('source4') String source4, - @Path('source5') String source5) + @Path('source5') String source5, + @Query("gateIds") String gateIds) @GET("/oes/{type}/{source}/{source1}/{source2}/{source3}/{source4}/{source5}/{source6}") Object getOesResponse9(@Path('type') String type,