diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy index 9a1734db79..9add092696 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy @@ -81,9 +81,26 @@ class OpsmxPlatformController { @RequestParam(value = "applicationName", required = false) String applicationName, @RequestParam(value = "noOfDays", required = false) Integer noOfDays, @RequestParam(value = "filterBy", required = false) String filterBy, - @RequestParam(value = "cdTool", required = false) String cdTool) { + @RequestParam(value = "cdTool", required = false) String cdTool, + @RequestParam(value = "cdlabel", required = false) String cdlabel, + @RequestParam(value = "syncstatus", required = false) String syncstatus, + @RequestParam(value = "health", required = false) String health, + @RequestParam(value = "cluster", required = false) String cluster, + @RequestParam(value = "targetrevision", required = false) String targetrevision, + @RequestParam(value = "sourcepath", required = false) String sourcepath, + @RequestParam(value = "destinationserver", required = false) String destinationserver, + @RequestParam(value = "project", required = false) String project, + @RequestParam(value = "namespace", required = false) String namespace, + @RequestParam(value = "revision", required = false) String revision, + @RequestParam(value = "applicationlabel", required = false) String applicationlabel, + @RequestParam(value = "description", required = false) String description, + @RequestParam(value = "service", required = false) String service, + @RequestParam(value = "image", required = false) String image, + @RequestParam(value = "clusterlabel", required = false) String clusterlabel, + @RequestParam(value = "application", required = false) String application) { return opsmxPlatformService.getPlatformResponse1(version, type, datasourceType, accountName, source, permission, - search, username, pageNo, pageLimit, sortBy, sortOrder, applicationId, applicationName, noOfDays, filterBy, cdTool) + search, username, pageNo, pageLimit, sortBy, sortOrder, applicationId, applicationName, noOfDays, filterBy, + cdTool,cdlabel,syncstatus,health,cluster,targetrevision,sourcepath,destinationserver,project,namespace,revision,applicationlabel,description,service, image,clusterlabel,application) } @ApiOperation(value = "Endpoint for platform rest services") diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy index f70fea3350..c9d3bace21 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy @@ -39,7 +39,23 @@ interface OpsmxPlatformService { @Query("applicationName") String applicationName, @Query("noOfDays") Integer noOfDays, @Query("filterBy") String filterBy, - @Query(value = "cdTool")String cdTool) + @Query(value = "cdTool") String cdTool, + @Query(value = "cdlabel") String cdlabel, + @Query(value = "syncstatus") String syncstatus, + @Query(value = "health") String health, + @Query(value = "cluster") String cluster, + @Query(value = "targetrevision") String targetrevision, + @Query(value = "sourcepath") String sourcepath, + @Query(value = "destinationserver") String destinationserver, + @Query(value = "project") String project, + @Query(value = "namespace") String namespace, + @Query(value = "revision") String revision, + @Query(value = "applicationlabel") String applicationlabel, + @Query(value = "description") String description, + @Query(value = "service") String service, + @Query(value = "image") String image, + @Query(value = "clusterlabel") String clusterlabel, + @Query(value = "application") String application) @GET("/platformservice/{version}/{type}/{source}") Object getPlatformResponse(@Path('version') String version, diff --git a/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/controllers/OpsmxAuditClientServiceController.groovy b/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/controllers/OpsmxAuditClientServiceController.groovy index 4fbc64d6c5..4900baced0 100644 --- a/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/controllers/OpsmxAuditClientServiceController.groovy +++ b/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/controllers/OpsmxAuditClientServiceController.groovy @@ -73,9 +73,23 @@ class OpsmxAuditClientServiceController { @RequestParam(value = "sortBy", required = false) String sortBy, @RequestParam(value = "limit", required = false) Integer limit, @RequestParam(value = "applicationName", required = false) String applicationName, - @RequestParam(value = "agentName", required = false) String agentName) { + @RequestParam(value = "agentName", required = false) String agentName, + @RequestParam(value = "project", required = false) String project, + @RequestParam(value = "cdlabel", required = false) String cdlabel, + @RequestParam(value = "application", required = false) String application, + @RequestParam(value = "sourcerepo", required = false) String sourcerepo, + @RequestParam(value = "cluster", required = false) String cluster, + @RequestParam(value = "revision", required = false) String revision, + @RequestParam(value = "applicationlabel", required = false) String applicationlabel, + @RequestParam(value = "namespace", required = false) String namespace, + @RequestParam(value = "clusterlabel", required = false) String clusterlabel, + @RequestParam(value = "sourcepath", required = false) String sourcepath, + @RequestParam(value = "targetrevision", required = false) String targetrevision, + @RequestParam(value = "initiatedby", required = false) String initiatedby, + @RequestParam(value = "service", required = false) String service, + @RequestParam(value = "image", required = false) String image) { return opsmxAuditClientService.getDeliveryInsightCharts(version, type, source, chartId, startTime, endTime, days, - noOfDays, argoName, search, sort, page, pageLimit, sortBy,limit,applicationName,agentName) + noOfDays, argoName, search, sort, page, pageLimit, sortBy,limit,applicationName,agentName,project,cdlabel,application,sourcerepo,cluster,revision,applicationlabel,namespace,clusterlabel,sourcepath,targetrevision,initiatedby,service,image) } @ApiOperation(value = "Endpoint for audit-client rest services") diff --git a/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/services/OpsmxAuditClientService.groovy b/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/services/OpsmxAuditClientService.groovy index 9ed3a8b7dc..b085c6cf08 100644 --- a/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/services/OpsmxAuditClientService.groovy +++ b/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/services/OpsmxAuditClientService.groovy @@ -51,7 +51,21 @@ interface OpsmxAuditClientService { @Query("sortBy") String sortBy, @Query("limit") Integer limit, @Query("applicationName") String applicationName, - @Query("agentName") String agentName) + @Query("agentName") String agentName, + @Query("project") String project, + @Query("cdlabel") String cdlabel, + @Query("application") String application, + @Query("sourcerepo") String sourcerepo, + @Query("cluster") String cluster, + @Query("revision") String revision, + @Query("applicationlabel") String applicationlabel, + @Query("namespace") String namespace, + @Query("clusterlabel") String clusterlabel, + @Query("sourcepath") String sourcepath, + @Query("targetrevision") String targetrevision, + @Query("initiatedby") String initiatedby, + @Query("service") String service, + @Query("image") String image) @GET("/auditclientservice/{version}/{type}/{source}/{source1}") Object getAuditClientResponse3(@Path('version') String version,