feat:add vlogs server. #5343
Merged
feat:add vlogs server. #5343
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
🤖 Generated by lychee actionSummary
Full action output |
bxy4543
reviewed
Jan 13, 2025
service/vlogs/Makefile
Outdated
| @@ -0,0 +1,55 @@ | |||
| IMG ?= ghcr.io/labring/sealos-launchpad-service:latest | |||
service/vlogs/Makefile
Outdated
|
|
||
| .PHONY: docker-build | ||
| docker-build: build | ||
| mv bin/manager bin/service-launchpad-${TARGETARCH} |
service/vlogs/README.md
Outdated
| 1. Build and push your image to the location specified by `IMG`: | ||
|
|
||
| ```sh | ||
| make docker-build docker-push IMG=<some-registry>/sealos-cloud-database-monitor:tag |
| env: | ||
| - name: VM_SERVICE_HOST | ||
| value: http://vmsingle-victoria-metrics-k8s-stack.vm.svc:8429 | ||
| image: ghcr.io/labring/sealos-launchpad-service:latest |
| kind: Service | ||
| metadata: | ||
| labels: | ||
| app: launchpad-vlogs |
service/vlogs/server/server.go
Outdated
| if config, err := url.PathUnescape(kubeConfig); err == nil { | ||
| kubeConfig = config | ||
| } else { | ||
| return "", "", "", err |
There was a problem hiding this comment.
return with fmt.Errorf("failed to PathUnescape : %s", err)
For different errors in the same method, please use format to wrap different error messages.
service/vlogs/server/server.go
Outdated
| vlogsReq := &api.VlogsRequest{} | ||
| err := json.NewDecoder(req.Body).Decode(&vlogsReq) | ||
| if err != nil { | ||
| return "", "", "", errors.New("invalid JSON data,decode error") |
There was a problem hiding this comment.
The original error message is not included, replace with fmt.Errorf and include the original err information.
service/vlogs/server/server.go
Outdated
| return stream + generateCommonQuery(req) + builder.String() + generateDropQuery() + generateNumberQuery(req), nil | ||
| } | ||
|
|
||
| func generateStreamQuery(req *api.VlogsRequest) (string, error) { |
There was a problem hiding this comment.
Why is there no error return, but the return parameter needs to contain error?
service/vlogs/server/server.go
Outdated
| return builder.String() + stream + generateCommonQuery(req) + generateDropQuery() + generateNumberQuery(req), nil | ||
| } | ||
|
|
||
| func generateJsonQuery(req *api.VlogsRequest) (string, error) { |
lingdie
reviewed
Jan 23, 2025
service/vlogs/request/req.go
Outdated
| if err != nil { | ||
| return err | ||
| } | ||
| fmt.Printf("URL: %s\n", req.URL.String()) |
service/vlogs/server/server.go
Outdated
Comment on lines
31
to
45
| func (vl *VLogsServer) ServeHTTP(rw http.ResponseWriter, req *http.Request) { | ||
| pathPrefix := "" | ||
| switch { | ||
| case req.URL.Path == pathPrefix+"/queryLogsByParams": | ||
| vl.queryLogsByParams(rw, req) | ||
| default: | ||
| http.Error(rw, "Not found", http.StatusNotFound) | ||
| return | ||
| } | ||
| } |
service/vlogs/server/server.go
Outdated
| // return | ||
| //} | ||
|
|
||
| fmt.Println("query: " + query) |
service/vlogs/server/server.go
Outdated
| if req.JsonMode == "true" { | ||
| var builder strings.Builder | ||
| builder.WriteString(" | unpack_json") | ||
| if len(req.JsonQuery) > 0 { |
service/vlogs/server/server.go
Outdated
Comment on lines
126
to
134
| case "=": | ||
| item = fmt.Sprintf("| %s:=%s ", jsonQuery.Key, jsonQuery.Value) | ||
| case "!=": | ||
| item = fmt.Sprintf("| %s:(!=%s) ", jsonQuery.Key, jsonQuery.Value) | ||
| case "~": | ||
| item = fmt.Sprintf("| %s:%s ", jsonQuery.Key, jsonQuery.Value) | ||
| default: | ||
| return errors.New("invalid JSON data,jsonMode value err") |
service/vlogs/server/server.go
Outdated
Comment on lines
153
to
175
| switch { | ||
| case len(req.Pod) == 0 && len(req.Container) == 0: | ||
| builder.WriteString(fmt.Sprintf(`{namespace="%s"}`, req.Namespace)) | ||
| case len(req.Pod) == 0: | ||
| addItems(req.Namespace, "container", req.Container) | ||
| case len(req.Container) == 0: | ||
| addItems(req.Namespace, "pod", req.Pod) | ||
| default: | ||
| for i, container := range req.Container { | ||
| for j, pod := range req.Pod { | ||
| builder.WriteString(fmt.Sprintf(`{container="%s",namespace="%s",pod="%s"}`, container, req.Namespace, pod)) | ||
| if i != len(req.Container)-1 || j != len(req.Pod)-1 { | ||
| builder.WriteString(" OR ") | ||
| } | ||
| } | ||
| } | ||
| } | ||
| v.query += builder.String() |
There was a problem hiding this comment.
优化这段，如果是request定义导致这段代码不好写就改request定义
zzjin
reviewed
Jan 25, 2025
| - /config/config.yml | ||
| command: | ||
| - /manager | ||
| image: bearslyricattack/vlogs:latest |
bearslyricattack
force-pushed
the
vlogs
branch
2 times, most recently
from
a394d13 to
d18160c
Compare
feat:add vlogs server feat:add vlogs server feat:add vlogs server feat:add vlogs server feat:websocket and auto shutdown server. feat: devbox websocket. feat: devbox websocket. fix vlogs bug. fix vlogs bug. fix vlogs bug. fix vlogs bug. fix vlogs bug. fix vlogs bug. fix vlogs bug. fix vlogs bug. fix vlogs bug. fix vlogs bug. fix vlogs bug. fix vlogs bug. fix vlogs bug. code fmt.
bearslyricattack
force-pushed
the
vlogs
branch
from
e9bc489 to
a56460c
Compare
bxy4543
approved these changes
Feb 6, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.