-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add the hierarchy related commands (#200)
- Loading branch information
Showing
17 changed files
with
386 additions
and
9 deletions.
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,7 @@ query ($serviceId: ID!, $duration: Duration!) { | |
| id | ||
| name | ||
| type | ||
| layers | ||
| isReal | ||
| } | ||
| calls { | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| # Licensed to Apache Software Foundation (ASF) under one or more contributor | ||
| # license agreements. See the NOTICE file distributed with | ||
| # this work for additional information regarding copyright | ||
| # ownership. Apache Software Foundation (ASF) licenses this file to you under | ||
| # the Apache License, Version 2.0 (the "License"); you may | ||
| # not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
|
|
||
| query ($instanceId: ID!, $layer: String!) { | ||
| result: getInstanceHierarchy(instanceId: $instanceId, layer: $layer) { | ||
| relations { | ||
| upperInstance { | ||
| id | ||
| name | ||
| serviceId | ||
| serviceName | ||
| layer | ||
| normal | ||
| } | ||
| lowerInstance { | ||
| id | ||
| name | ||
| serviceId | ||
| serviceName | ||
| layer | ||
| normal | ||
| } | ||
| } | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| # Licensed to Apache Software Foundation (ASF) under one or more contributor | ||
| # license agreements. See the NOTICE file distributed with | ||
| # this work for additional information regarding copyright | ||
| # ownership. Apache Software Foundation (ASF) licenses this file to you under | ||
| # the Apache License, Version 2.0 (the "License"); you may | ||
| # not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
|
|
||
| query { | ||
| result: listLayerLevels { | ||
| layer level | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| # Licensed to Apache Software Foundation (ASF) under one or more contributor | ||
| # license agreements. See the NOTICE file distributed with | ||
| # this work for additional information regarding copyright | ||
| # ownership. Apache Software Foundation (ASF) licenses this file to you under | ||
| # the Apache License, Version 2.0 (the "License"); you may | ||
| # not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
|
|
||
| query ($serviceId: ID!, $layer: String!) { | ||
| result: getServiceHierarchy(serviceId: $serviceId, layer: $layer) { | ||
| relations { | ||
| upperService { | ||
| id | ||
| name | ||
| layer | ||
| normal | ||
| } | ||
| lowerService { | ||
| id | ||
| name | ||
| layer | ||
| normal | ||
| } | ||
| } | ||
| } | ||
| } |
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| // Licensed to Apache Software Foundation (ASF) under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Apache Software Foundation (ASF) licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package hierarchy | ||
|
|
||
| import "github.com/urfave/cli/v2" | ||
|
|
||
| var Command = &cli.Command{ | ||
| Name: "hierarchy", | ||
| Usage: "Hierarchy related sub-command", | ||
| Subcommands: []*cli.Command{ | ||
| serviceCommand, | ||
| instanceCommand, | ||
| layerCommand, | ||
| }, | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| // Licensed to Apache Software Foundation (ASF) under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Apache Software Foundation (ASF) licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package hierarchy | ||
|
|
||
| import ( | ||
| "github.com/apache/skywalking-cli/internal/commands/interceptor" | ||
| "github.com/apache/skywalking-cli/internal/flags" | ||
| "github.com/apache/skywalking-cli/pkg/display" | ||
| "github.com/apache/skywalking-cli/pkg/display/displayable" | ||
| "github.com/apache/skywalking-cli/pkg/graphql/hierarchy" | ||
|
|
||
| "github.com/urfave/cli/v2" | ||
| ) | ||
|
|
||
| var instanceCommand = &cli.Command{ | ||
| Name: "instance", | ||
| Aliases: []string{"inst"}, | ||
| Usage: "Query the hierarchy of given service instance", | ||
| Flags: flags.Flags( | ||
| flags.ServiceFlags, | ||
| flags.InstanceFlags, | ||
| []cli.Flag{ | ||
| &cli.StringFlag{ | ||
| Name: "layer", | ||
| Usage: "Name of the layer to query the hierarchy of this layer", | ||
| Required: true, | ||
| }, | ||
| }, | ||
| ), | ||
| Before: interceptor.BeforeChain( | ||
| interceptor.ParseInstance(true), | ||
| ), | ||
| Action: func(ctx *cli.Context) error { | ||
| instanceID := ctx.String("instance-id") | ||
| layer := ctx.String("layer") | ||
|
|
||
| hierarchy, err := hierarchy.InstanceHierarchy(ctx, instanceID, layer) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return display.Display(ctx, &displayable.Displayable{Data: hierarchy, Condition: instanceID}) | ||
| }, | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| // Licensed to Apache Software Foundation (ASF) under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Apache Software Foundation (ASF) licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package hierarchy | ||
|
|
||
| import ( | ||
| "github.com/apache/skywalking-cli/internal/commands/interceptor" | ||
| "github.com/apache/skywalking-cli/internal/flags" | ||
| "github.com/apache/skywalking-cli/pkg/display" | ||
| "github.com/apache/skywalking-cli/pkg/display/displayable" | ||
| "github.com/apache/skywalking-cli/pkg/graphql/hierarchy" | ||
|
|
||
| "github.com/urfave/cli/v2" | ||
| ) | ||
|
|
||
| var layerCommand = &cli.Command{ | ||
| Name: "layer-levels", | ||
| Aliases: []string{"ll"}, | ||
| Usage: "Query all layer hierarchy levels", | ||
| Flags: flags.Flags(), | ||
| Before: interceptor.BeforeChain(), | ||
| Action: func(ctx *cli.Context) error { | ||
| levels, err := hierarchy.ListLayerLevels(ctx) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return display.Display(ctx, &displayable.Displayable{Data: levels}) | ||
| }, | ||
| } |
Oops, something went wrong.