set-log-severity-for-managed-cluster-components

internal/commands/loglevel/set.go

@@ -22,14 +22,14 @@ import (
 	"strings"
 
 	docopt "github.com/docopt/docopt-go"
-
 	libsveltosv1alpha1 "github.com/projectsveltos/libsveltos/api/v1alpha1"
+	"github.com/projectsveltos/sveltosctl/internal/utils"
 )
 
 func updateDebuggingConfiguration(ctx context.Context, logSeverity libsveltosv1alpha1.LogLevel,
-	component string) error {
+	component, namespace, clusterName, clusterType string) error {
 
-	cc, err := collectLogLevelConfiguration(ctx)
+	cc, err := collectLogLevelConfiguration(ctx, namespace, clusterName, clusterType)
 	if err != nil {
 		return nil
 	}
@@ -62,22 +62,25 @@ func updateDebuggingConfiguration(ctx context.Context, logSeverity libsveltosv1a
 		)
 	}
 
-	return updateLogLevelConfiguration(ctx, spec)
+	return updateLogLevelConfiguration(ctx, spec, namespace, clusterName, clusterType)
 }
 
 // Set displays/changes log verbosity for a given component
 func Set(ctx context.Context, args []string) error {
 	doc := `Usage:
-  sveltosctl log-level set --component=<name> (--info|--debug|--verbose)
+  sveltosctl log-level set --component=<name> [--namespace=<namespace>] [--cluster=<cluster-name>] [--cluster-type=<cluster-type>] (--info|--debug|--verbose)
 Options:
-  -h --help             Show this screen.
-     --component=<name> Name of the component for which log severity is being set.
-     --info             Set log severity to info.
-     --debug            Set log severity to debug.
-     --verbose          Set log severity to verbose.
+  -h --help                		   Show this screen.
+     --component=<name>    		   Name of the component for which log severity is being set.
+     --namespace=<namespace> 	   Namespace of the cluster.
+     --cluster=<cluster-name> 	   Name of the cluster.
+     --cluster-type=<cluster-type> Type of the cluster (Capi or Sveltos).
+     --info                		   Set log severity to info.
+     --debug               		   Set log severity to debug.
+     --verbose             		   Set log severity to verbose.
 
 Description:
-  The log-level set command set log severity for the specified component.
+  The log-level set command sets log severity for the specified component in the specified cluster.
 `
 	parsedArgs, err := docopt.ParseArgs(doc, nil, "1.0")
 	if err != nil {
@@ -94,6 +97,18 @@ Description:
 	if passedComponent := parsedArgs["--component"]; passedComponent != nil {
 		component = passedComponent.(string)
 	}
+	namespace := ""
+    if passedNamespace := parsedArgs["--namespace"]; passedNamespace != nil {
+        namespace = passedNamespace.(string)
+    }
+	clusterName := ""
+	if passedClusterName := parsedArgs["--cluster"]; passedClusterName != nil {
+        clusterName = passedClusterName.(string)
+    }
+	clusterType := ""
+	if passedClusterType := parsedArgs["--cluster-type"]; passedClusterType != nil {
+        clusterType = passedClusterType.(string)
+    }
 
 	info := parsedArgs["--info"].(bool)
 	debug := parsedArgs["--debug"].(bool)
@@ -108,5 +123,5 @@ Description:
 		logSeverity = libsveltosv1alpha1.LogLevelVerbose
 	}
 
-	return updateDebuggingConfiguration(ctx, logSeverity, component)
+	return updateDebuggingConfiguration(ctx, logSeverity, component, namespace, clusterName, clusterType)
 }

internal/commands/loglevel/set_test.go

@@ -30,18 +30,17 @@ import (
 
 var _ = Describe("Set", func() {
 	It("set updates default DebuggingConfiguration instance", func() {
-
 		scheme, err := utils.GetScheme()
 		Expect(err).To(BeNil())
 		c := fake.NewClientBuilder().WithScheme(scheme).Build()
 
 		utils.InitalizeManagementClusterAcces(scheme, nil, nil, c)
 		Expect(loglevel.UpdateDebuggingConfiguration(context.TODO(), libsveltosv1alpha1.LogLevelDebug,
-			string(libsveltosv1alpha1.ComponentAddonManager))).To(Succeed())
+			string(libsveltosv1alpha1.ComponentAddonManager), "", "", "")).To(Succeed())
 
 		k8sAccess := utils.GetAccessInstance()
 
-		currentDC, err := k8sAccess.GetDebuggingConfiguration(context.TODO())
+		currentDC, err := k8sAccess.GetDebuggingConfiguration(context.TODO(), "", "", "")
 		Expect(err).To(BeNil())
 		Expect(currentDC).ToNot(BeNil())
 		Expect(currentDC.Spec.Configuration).ToNot(BeNil())
@@ -50,8 +49,8 @@ var _ = Describe("Set", func() {
 		Expect(currentDC.Spec.Configuration[0].LogLevel).To(Equal(libsveltosv1alpha1.LogLevelDebug))
 
 		Expect(loglevel.UpdateDebuggingConfiguration(context.TODO(), libsveltosv1alpha1.LogLevelInfo,
-			string(libsveltosv1alpha1.ComponentAddonManager))).To(Succeed())
-		currentDC, err = k8sAccess.GetDebuggingConfiguration(context.TODO())
+			string(libsveltosv1alpha1.ComponentAddonManager), "", "", "")).To(Succeed())
+		currentDC, err = k8sAccess.GetDebuggingConfiguration(context.TODO(), "", "", "")
 		Expect(err).To(BeNil())
 		Expect(currentDC).ToNot(BeNil())
 		Expect(currentDC.Spec.Configuration).ToNot(BeNil())

internal/commands/loglevel/show.go

@@ -26,8 +26,8 @@ import (
 	"github.com/olekukonko/tablewriter"
 )
 
-func showLogSettings(ctx context.Context) error {
-	componentConfiguration, err := collectLogLevelConfiguration(ctx)
+func showLogSettings(ctx context.Context, namespace, clusterName, clusterType string) error {
+	componentConfiguration, err := collectLogLevelConfiguration(ctx, namespace, clusterName, clusterType)
 	if err != nil {
 		return err
 	}
@@ -52,12 +52,15 @@ func showLogSettings(ctx context.Context) error {
 // Show displays information about log verbosity (if set)
 func Show(ctx context.Context, args []string) error {
 	doc := `Usage:
-  sveltosctl log-level show
+  sveltosctl log-level show [--namespace=<namespace>] [--cluster=<cluster-name>] [--cluster-type=<cluster-type>]
 Options:
-  -h --help             Show this screen.
+  	-h --help                        Show this screen.
+       --namespace=<namespace>       Namespace of the cluster.
+       --cluster=<cluster-name>      Name of the cluster.
+       --cluster-type=<cluster-type> Type of the cluster (Capi or Sveltos).
 
 Description:
-  The log-level show command shows information about current log verbosity.
+  The log-level show command shows information about current log verbosity in the specified cluster.
 `
 	parsedArgs, err := docopt.ParseArgs(doc, nil, "1.0")
 	if err != nil {
@@ -70,5 +73,19 @@ Description:
 		return nil
 	}
 
-	return showLogSettings(ctx)
-}
+	namespace := ""
+    if passedNamespace := parsedArgs["--namespace"]; passedNamespace != nil {
+        namespace = passedNamespace.(string)
+    }
+	clusterName := ""
+	if passedClusterName := parsedArgs["--cluster"]; passedClusterName != nil {
+        clusterName = passedClusterName.(string)
+    }
+	clusterType := ""
+	if passedClusterType := parsedArgs["--cluster-type"]; passedClusterType != nil {
+        clusterType = passedClusterType.(string)
+    }
+
+
+	return showLogSettings(ctx, namespace, clusterName, clusterType)
+}

internal/commands/loglevel/show_test.go

@@ -35,7 +35,7 @@ import (
 )
 
 var _ = Describe("Show", func() {
-	It("show displays current log level settings", func() {
+	It("show displays current log level settings in managed cluster", func() {
 		dc := getDebuggingConfiguration()
 		dc.Spec.Configuration = []libsveltosv1alpha1.ComponentConfiguration{
 			{Component: libsveltosv1alpha1.ComponentClassifier, LogLevel: libsveltosv1alpha1.LogLevelDebug},
@@ -52,7 +52,7 @@ var _ = Describe("Show", func() {
 		c := fake.NewClientBuilder().WithScheme(scheme).WithObjects(initObjects...).Build()
 
 		utils.InitalizeManagementClusterAcces(scheme, nil, nil, c)
-		err = loglevel.ShowLogSettings(context.TODO())
+		err = loglevel.ShowLogSettings(context.TODO(), "", "", "")
 		Expect(err).To(BeNil())
 
 		w.Close()
@@ -61,7 +61,7 @@ var _ = Describe("Show", func() {
 		Expect(err).To(BeNil())
 
 		/*
-			// This is an example of how the table needs to look like
+		// This is an example of how the table needs to look like
 			   +------------------+---------------+
 			   |      COMPONENT   | VERBOSIRY     |
 			   +------------------+---------------+
@@ -82,4 +82,4 @@ var _ = Describe("Show", func() {
 		Expect(found).To(BeTrue())
 		os.Stdout = old
 	})
-})
+})

internal/commands/loglevel/unset.go

@@ -22,12 +22,11 @@ import (
 	"strings"
 
 	docopt "github.com/docopt/docopt-go"
-
 	libsveltosv1alpha1 "github.com/projectsveltos/libsveltos/api/v1alpha1"
 )
 
-func unsetDebuggingConfiguration(ctx context.Context, component string) error {
-	cc, err := collectLogLevelConfiguration(ctx)
+func unsetDebuggingConfiguration(ctx context.Context, component, namespace, clusterName, clusterType string) error {
+	cc, err := collectLogLevelConfiguration(ctx, namespace, clusterName, clusterType)
 	if err != nil {
 		return nil
 	}
@@ -50,21 +49,24 @@ func unsetDebuggingConfiguration(ctx context.Context, component string) error {
 	}
 
 	if found {
-		return updateLogLevelConfiguration(ctx, spec)
+		return updateLogLevelConfiguration(ctx, spec, namespace, clusterName, clusterType)
 	}
 	return nil
 }
 
 // Unset resets log verbosity for a given component
 func Unset(ctx context.Context, args []string) error {
 	doc := `Usage:
-  sveltosctl log-level unset --component=<name>
+  sveltosctl log-level unset --component=<name> [--namespace=<namespace>] [--cluster=<cluster-name>] [--cluster-type=<cluster-type>]
 Options:
-  -h --help             Show this screen.
-     --component=<name> Name of the component for which log severity is being set.
+  -h --help                		   Show this screen.
+     --component=<name>    		   Name of the component for which log severity is being unset.
+     --namespace=<namespace> 	   Namespace of the cluster.
+     --cluster=<cluster-name> 	   Name of the cluster.
+     --cluster-type=<cluster-type> Type of the cluster (Capi or Sveltos).
 
 Description:
-  The log-level set command set log severity for the specified component.
+  The log-level unset command unset log severity for the specified component in the specified cluster.
 `
 	parsedArgs, err := docopt.ParseArgs(doc, nil, "1.0")
 	if err != nil {
@@ -81,6 +83,18 @@ Description:
 	if passedComponent := parsedArgs["--component"]; passedComponent != nil {
 		component = passedComponent.(string)
 	}
+	namespace := ""
+    if passedNamespace := parsedArgs["--namespace"]; passedNamespace != nil {
+        namespace = passedNamespace.(string)
+    }
+	clusterName := ""
+	if passedClusterName := parsedArgs["--cluster"]; passedClusterName != nil {
+        clusterName = passedClusterName.(string)
+    }
+	clusterType := ""
+	if passedClusterType := parsedArgs["--cluster-type"]; passedClusterType != nil {
+        clusterType = passedClusterType.(string)
+    }
 
-	return unsetDebuggingConfiguration(ctx, component)
-}
+	return unsetDebuggingConfiguration(ctx, component, namespace, clusterName, clusterType)
+}

internal/commands/loglevel/unset_test.go

@@ -30,7 +30,7 @@ import (
 )
 
 var _ = Describe("Unset", func() {
-	It("unset removes log level settings", func() {
+	It("unset removes log level settings in managed cluster", func() {
 		dc := getDebuggingConfiguration()
 		dc.Spec.Configuration = []libsveltosv1alpha1.ComponentConfiguration{
 			{Component: libsveltosv1alpha1.ComponentClassifier, LogLevel: libsveltosv1alpha1.LogLevelInfo},
@@ -45,17 +45,17 @@ var _ = Describe("Unset", func() {
 
 		utils.InitalizeManagementClusterAcces(scheme, nil, nil, c)
 
-		Expect(loglevel.UnsetDebuggingConfiguration(context.TODO(), string(libsveltosv1alpha1.ComponentClassifier))).To(Succeed())
+		Expect(loglevel.UnsetDebuggingConfiguration(context.TODO(), string(libsveltosv1alpha1.ComponentClassifier), "", "", "")).To(Succeed())
 
 		k8sAccess := utils.GetAccessInstance()
 
-		currentDC, err := k8sAccess.GetDebuggingConfiguration(context.TODO())
+		currentDC, err := k8sAccess.GetDebuggingConfiguration(context.TODO(), "", "", "")
 		Expect(err).To(BeNil())
 		Expect(currentDC).ToNot(BeNil())
 		Expect(currentDC.Spec.Configuration).ToNot(BeNil())
 		Expect(len(currentDC.Spec.Configuration)).To(Equal(1))
 		Expect(currentDC.Spec.Configuration[0].Component).To(Equal(libsveltosv1alpha1.ComponentAddonManager))
 		Expect(currentDC.Spec.Configuration[0].LogLevel).To(Equal(libsveltosv1alpha1.LogLevelInfo))
-
 	})
 })
+

internal/commands/loglevel/utils.go

@@ -41,10 +41,10 @@ func (c byComponent) Less(i, j int) bool {
 	return c[i].component < c[j].component
 }
 
-func collectLogLevelConfiguration(ctx context.Context) ([]*componentConfiguration, error) {
+func collectLogLevelConfiguration(ctx context.Context, namespace, clusterName, clusterType string) ([]*componentConfiguration, error) {
 	instance := utils.GetAccessInstance()
 
-	dc, err := instance.GetDebuggingConfiguration(ctx)
+	dc, err := instance.GetDebuggingConfiguration(ctx, namespace, clusterName, clusterType)
 	if err != nil {
 		if apierrors.IsNotFound(err) {
 			return make([]*componentConfiguration, 0), nil
@@ -70,16 +70,18 @@ func collectLogLevelConfiguration(ctx context.Context) ([]*componentConfiguratio
 func updateLogLevelConfiguration(
 	ctx context.Context,
 	spec []libsveltosv1alpha1.ComponentConfiguration,
+	namespace, clusterName, clusterType string,
 ) error {
 
 	instance := utils.GetAccessInstance()
 
-	dc, err := instance.GetDebuggingConfiguration(ctx)
+	dc, err := instance.GetDebuggingConfiguration(ctx, namespace, clusterName, clusterType)
 	if err != nil {
 		if apierrors.IsNotFound(err) {
 			dc = &libsveltosv1alpha1.DebuggingConfiguration{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "default",
+					Namespace: namespace,
 				},
 			}
 		} else {
@@ -91,5 +93,5 @@ func updateLogLevelConfiguration(
 		Configuration: spec,
 	}
 
-	return instance.UpdateDebuggingConfiguration(ctx, dc)
-}
+	return instance.UpdateDebuggingConfiguration(ctx, dc, namespace, clusterName, clusterType)
+}