diff --git a/v1/Application.cfc b/v1/Application.cfc index faea56c..11e3f4f 100644 --- a/v1/Application.cfc +++ b/v1/Application.cfc @@ -50,8 +50,8 @@ //variables.framework.allowCrossDomain = ""; // перепишем явно, возвращая Origin //variables.framework.docs={}; - variables.framework.docs.APIName="Deck API"; - variables.framework.docs.APIVersion="0.129"; /*$ git config --global --unset user.password*/ + variables.framework.docs.APIName="svc-api"; + variables.framework.docs.APIVersion="0.131"; /*instance_data field removed*/ /*$ git config --global --unset user.password*/ variables.framework.globalHeaders = structNew(); diff --git a/v1/resources/instance.cfc b/v1/resources/instance.cfc index 17c5e39..6ab21ce 100644 --- a/v1/resources/instance.cfc +++ b/v1/resources/instance.cfc @@ -104,8 +104,8 @@ - - + + @@ -189,11 +189,12 @@ ---> - + select p.svc_operation_cfs_param ,p.label ,p.descr + ,p.is_sensitive ,r.svc_id as ref_svc_id ,r.svc as ref_svc ,r.code as ref_code @@ -206,13 +207,13 @@ - - - - - - - + + + + + + + @@ -232,14 +233,44 @@ "isAuxiliary": #request.castToBool(qDependency.is_auxiliary)# }/> - - - - - - + + + + + + + + + select + p.svc_operation_cfs_param + ,p.label + ,p.descr + ,p.is_sensitive + from svc_operation_cfs_param p + join svc_operation o on (p.svc_operation_id=o.svc_operation_id) + join svc on (o.svc_id=svc.svc_id) + where svc.svc_id= + AND o.operation='create' + + + + + + + + + + + + + + + + + + @@ -248,7 +279,7 @@ - + @@ -334,7 +365,7 @@ )/> - + diff --git a/v1/resources/instance_ls.cfc b/v1/resources/instance_ls.cfc index a503b0f..817c8cb 100644 --- a/v1/resources/instance_ls.cfc +++ b/v1/resources/instance_ls.cfc @@ -29,7 +29,8 @@ "duration"={prefix="inr", type="numeric"}, "uptime"={prefix="inr", type="numeric"}, "dt_deploy"={prefix="inr", type="date"}, - "instance_data"={prefix="inr", type="string"}, + + "monitoring_url"={prefix="inr", type="string"}, "instance_state_uid"={prefix="inr", type="guid"}, "is_deleted"={prefix="inr", type="string"}, "is_suspended"={prefix="inr", type="string"}, @@ -170,12 +171,13 @@ as uptime to_char(io.dt_finish, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_deploy - st.instance_data::text as instance_data + st.instance_state_uid::text as instance_state_uid st.is_test as is_test coalesce(st.instance_data->>'isDeleted','false') as is_deleted st.instance_data->>'isSuspended' as is_suspended st.instance_data->'job'->>'pending' as job_is_pending + st.instance_data->'out'->'monitoring'->>'allDashboards' as monitoring_url st.instance_data->'params'->>'resourceRealm' as resource_realm to_char(st.dt_state, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_state - +