Skip to content

Commit 2bb7253

Browse files
committed
OSD-20175: Make clusterId as argument
1 parent f35939b commit 2bb7253

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

cmd/cluster/dynatrace/logsCmd.go

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,22 @@ var (
2525

2626
func NewCmdLogs() *cobra.Command {
2727
logsCmd := &cobra.Command{
28-
Use: "logs",
28+
Use: "logs <cluster-id>",
2929
Short: "Fetch logs from Dynatrace",
30-
Args: cobra.NoArgs,
30+
Args: cobra.ExactArgs(1),
3131
DisableAutoGenTag: true,
3232
Run: func(cmd *cobra.Command, args []string) {
33-
err := main()
33+
err := main(args[0])
3434
if err != nil {
3535
cmdutil.CheckErr(err)
3636
}
3737
},
3838
}
3939

40-
// set cluster flag as required
41-
logsCmd.MarkFlagRequired("cluster")
42-
4340
logsCmd.Flags().BoolVar(&dryRun, "dry-run", false, "Only builds the query without fetching any logs from the tenant")
4441
logsCmd.Flags().IntVar(&tail, "tail", 100, "Last 'n' logs to fetch (defaults to 100)")
4542
logsCmd.Flags().IntVar(&since, "since", 1, "Number of hours (integer) since which to search (defaults to 1 hour)")
4643
logsCmd.Flags().StringVar(&contains, "contains", "", "Include logs which contain a phrase")
47-
logsCmd.Flags().StringVar(&cluster, "cluster", "", "Cluster identifier (name / internal ID / external ID) to search")
4844
logsCmd.Flags().StringVar(&sortOrder, "sort", "desc", "Sort the results by timestamp in either ascending or descending order. Accepted values are 'asc' and 'desc'")
4945
logsCmd.Flags().BoolVar(&hcp, "hcp", false, "Set true to Include the HCP Namespace")
5046
logsCmd.Flags().StringSliceVar(&namespaceList, "namespace", []string{}, "Namespace(s) (comma-separated)")
@@ -60,12 +56,12 @@ func getLinkToWebConsole(dtURL string, since int, base64Url string) string {
6056
return fmt.Sprintf("\nLink to Web Console - \n%sui/apps/dynatrace.classic.logs.events/ui/logs-events?gtf=-%dh&gf=all&sortDirection=desc&advancedQueryMode=true&isDefaultQuery=false&visualizationType=table#%s\n\n", dtURL, since, base64Url)
6157
}
6258

63-
func main() error {
59+
func main(clusterID string) error {
6460
if since <= 0 {
6561
return fmt.Errorf("invalid time duration")
6662
}
6763

68-
clusterInternalID, mgmtClusterName, DTURL, err := fetchClusterDetails(cluster)
64+
clusterInternalID, mgmtClusterName, DTURL, err := fetchClusterDetails(clusterID)
6965
if err != nil {
7066
return fmt.Errorf("failed to acquire cluster details %v", err)
7167
}

0 commit comments

Comments
 (0)