feat(kiali): Consolidate kiali tools from 20 to 6 #496
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| package kiali | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "strings" | ||
| "sync" | ||
| ) | ||
|
|
||
| type GetMeshGraphResponse struct { | ||
| Graph json.RawMessage `json:"graph,omitempty"` | ||
| Health json.RawMessage `json:"health,omitempty"` | ||
| MeshStatus json.RawMessage `json:"mesh_status,omitempty"` | ||
| Namespaces json.RawMessage `json:"namespaces,omitempty"` | ||
| Errors map[string]string `json:"errors,omitempty"` | ||
| } | ||
|
|
||
| // GetMeshGraph fetches multiple Kiali endpoints in parallel and returns a combined response. | ||
| // Each field in the response corresponds to one API call result. | ||
| // - graph: /api/namespaces/graph (optionally filtered by namespaces) | ||
| // - health: /api/clusters/health (optionally filtered by namespaces and queryParams) | ||
| // - status(mesh):/api/mesh/graph | ||
| // - namespaces: /api/namespaces | ||
| func (k *Kiali) GetMeshGraph(ctx context.Context, namespaces []string, queryParams map[string]string) (string, error) { | ||
|
Member
There was a problem hiding this comment. Note, this is a good candidate to try out MCP progress notifications (Not in this PR) |
||
| cleaned := make([]string, 0, len(namespaces)) | ||
| for _, ns := range namespaces { | ||
| ns = strings.TrimSpace(ns) | ||
| if ns != "" { | ||
| cleaned = append(cleaned, ns) | ||
| } | ||
| } | ||
|
|
||
| resp := GetMeshGraphResponse{ | ||
| Errors: make(map[string]string), | ||
| } | ||
|
|
||
| var errorsMu sync.Mutex | ||
| var wg sync.WaitGroup | ||
| wg.Add(4) | ||
|
|
||
| // Graph | ||
| go func() { | ||
| defer wg.Done() | ||
| data, err := k.getGraph(ctx, cleaned, queryParams) | ||
| if err != nil { | ||
| errorsMu.Lock() | ||
| resp.Errors["graph"] = err.Error() | ||
| errorsMu.Unlock() | ||
| return | ||
| } | ||
| resp.Graph = data | ||
| }() | ||
|
|
||
| // Health | ||
| go func() { | ||
| defer wg.Done() | ||
| data, err := k.getHealth(ctx, cleaned, queryParams) | ||
| if err != nil { | ||
| errorsMu.Lock() | ||
| resp.Errors["health"] = err.Error() | ||
| errorsMu.Unlock() | ||
| return | ||
| } | ||
| resp.Health = data | ||
| }() | ||
|
|
||
| // Mesh status | ||
| go func() { | ||
| defer wg.Done() | ||
| data, err := k.getMeshStatus(ctx) | ||
| if err != nil { | ||
| errorsMu.Lock() | ||
| resp.Errors["mesh_status"] = err.Error() | ||
| errorsMu.Unlock() | ||
| return | ||
| } | ||
| resp.MeshStatus = data | ||
| }() | ||
|
|
||
| // Namespaces | ||
| go func() { | ||
| defer wg.Done() | ||
| data, err := k.getNamespaces(ctx) | ||
| if err != nil { | ||
| errorsMu.Lock() | ||
| resp.Errors["namespaces"] = err.Error() | ||
| errorsMu.Unlock() | ||
| return | ||
| } | ||
| resp.Namespaces = data | ||
| }() | ||
|
|
||
| wg.Wait() | ||
|
|
||
| // If no errors occurred, omit the errors map in the final JSON | ||
| if len(resp.Errors) == 0 { | ||
| resp.Errors = nil | ||
| } | ||
|
|
||
| encoded, err := json.Marshal(resp) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| return string(encoded), nil | ||
| } | ||
|
|
||
| // getGraph wraps the Graph call and returns raw JSON. | ||
| func (k *Kiali) getGraph(ctx context.Context, namespaces []string, queryParams map[string]string) (json.RawMessage, error) { | ||
| out, err := k.Graph(ctx, namespaces, queryParams) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return json.RawMessage([]byte(out)), nil | ||
| } | ||
|
|
||
| // getHealth wraps the Health call and returns raw JSON. | ||
| func (k *Kiali) getHealth(ctx context.Context, namespaces []string, queryParams map[string]string) (json.RawMessage, error) { | ||
| nsParam := strings.Join(namespaces, ",") | ||
| out, err := k.Health(ctx, nsParam, queryParams) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return json.RawMessage([]byte(out)), nil | ||
| } | ||
|
|
||
| // getMeshStatus wraps the MeshStatus call and returns raw JSON. | ||
| func (k *Kiali) getMeshStatus(ctx context.Context) (json.RawMessage, error) { | ||
| out, err := k.MeshStatus(ctx) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return json.RawMessage([]byte(out)), nil | ||
| } | ||
|
|
||
| // getNamespaces wraps the ListNamespaces call and returns raw JSON. | ||
| func (k *Kiali) getNamespaces(ctx context.Context) (json.RawMessage, error) { | ||
| out, err := k.ListNamespaces(ctx) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return json.RawMessage([]byte(out)), nil | ||
| } | ||
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.