Skip to content

Commit

Permalink
Merge pull request #54 from Ru5her/revert-53-QCOS-3420
Browse files Browse the repository at this point in the history
QCOS-3420 Revert kirk日志搜索修改访问日志字段
  • Loading branch information
nowenL authored Dec 23, 2016
2 parents 03e4b0b + 5346299 commit 463918b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 33 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# vNext
- 修改日志搜索返回结果字段及其Tag

# Release 2.0.0
- 新增app授权和撤销授权功能
Expand Down
39 changes: 7 additions & 32 deletions kirksdk/qcos_api.go
Original file line number Diff line number Diff line change
Expand Up @@ -752,38 +752,13 @@ type LogsSearchResult struct {
}

type Hit struct {
CollectedAt time.Time `json:"collectedAt" repo:"pod,access"`
CollectedAtNano int64 `json:"collectedAtNano" repo:"pod,access"`
Host string `json:"host" repo:"pod,access"`

Log string `json:"log" repo:"pod"`
Path string `json:"path" repo:"pod"`
Pattern string `json:"pattern" repo:"pod"`
ContainerId string `json:"containerId" repo:"pod"`
ContainerName string `json:"containerName" repo:"pod"`
JobInstance string `json:"jobInstance" repo:"pod"`
JobTask string `json:"jobTask" repo:"pod"`
PodIp string `json:"podIp" repo:"pod"`
PodName string `json:"podName" repo:"pod"`
PodVer string `json:"podVer" repo:"pod"`
ProcessName string `json:"processName" repo:"pod"`
Sip string `json:"sip" repo:"pod"`
Source string `json:"source" repo:"pod"`

Type string `json:"type" repo:"access"`
RequestApp string `json:"requestApp" repo:"access"`
GateId string `json:"gateId" repo:"access"`
StartAt time.Time `json:"startAt" repo:"access"`
Method string `json:"method" repo:"access"`
Url string `json:"url" repo:"access"`
ReqId string `json:"reqId" repo:"access"`
StatusCode int64 `json:"statusCode" repo:"access"`
ElapsedNano int64 `json:"elapsedNano" repo:"access"`
RequestHeader string `json:"requestHeader" repo:"access"`
RequestParams string `json:"requestParams" repo:"access"`
RequestBody string `json:"requestBody" repo:"access"`
ResponseHeader string `json:"responseHeader" repo:"access"`
ResponseBody string `json:"responseBody" repo:"access"`
Log string `json:"log"`
CollectedAt time.Time `json:"collectedAt"`
CollectedAtNano int64 `json:"collectedAtNano"`
PodIP string `json:"podIp"`
ProcessName string `json:"processName"`
GateID string `json:"gateId"`
Domain string `json:"domain"`
}

var (
Expand Down

0 comments on commit 463918b

Please sign in to comment.