chore: the monitoring components need to be disabled when installing …

…Kubeblocks (#4004)

cmd/dashboard/dashboard.go

@@ -49,7 +49,7 @@ const (
 	podRunningTimeoutFlag = "pod-running-timeout"
 	defaultPodExecTimeout = 60 * time.Second
 	grafanaAddonName      = "kubeblocks-grafana"
-	lokiAddonName         = "kubeblocks-loki"
+	lokiAddonName         = "kubeblocks-logs"
 	lokiGrafanaDirect     = "container-logs"
 	localAdd              = "127.0.0.1"
 )

cmd/kubeblocks/config_test.go

@@ -112,7 +112,6 @@ var _ = Describe("backupconfig", func() {
 				Dynamic:   testing.FakeDynamicClient(),
 			},
 			Version:   version.DefaultKubeBlocksVersion,
-			Monitor:   true,
 			ValueOpts: values.Options{Values: []string{"snapshot-controller.enabled=true"}},
 		}
 	})

cmd/kubeblocks/install.go

@@ -54,7 +54,6 @@ import (
 )
 
 const (
-	kMonitorParam    = "prometheus.enabled=%[1]t,grafana.enabled=%[1]t"
 	kNodeAffinity    = "affinity.nodeAffinity=%s"
 	kPodAntiAffinity = "affinity.podAntiAffinity=%s"
 	kTolerations     = "tolerations=%s"
@@ -76,7 +75,6 @@ type Options struct {
 type InstallOptions struct {
 	Options
 	Version         string
-	Monitor         bool
 	Quiet           bool
 	CreateNamespace bool
 	Check           bool
@@ -142,7 +140,6 @@ func newInstallCmd(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobr
 		},
 	}
 
-	cmd.Flags().BoolVar(&o.Monitor, "monitor", true, "Auto install monitoring add-ons including prometheus, grafana and alertmanager-webhook-adaptor")
 	cmd.Flags().StringVar(&o.Version, "version", version.DefaultKubeBlocksVersion, "KubeBlocks version")
 	cmd.Flags().BoolVar(&o.CreateNamespace, "create-namespace", false, "Create the namespace if not present")
 	cmd.Flags().BoolVar(&o.Check, "check", true, "Check kubernetes environment before installation")
@@ -231,8 +228,6 @@ func (o *InstallOptions) PreCheck() error {
 
 func (o *InstallOptions) Install() error {
 	var err error
-	// add monitor parameters
-	o.ValueOpts.Values = append(o.ValueOpts.Values, fmt.Sprintf(kMonitorParam, o.Monitor))
 
 	// add pod anti-affinity
 	if o.PodAntiAffinity != "" || len(o.TopologyKeys) > 0 {
@@ -498,18 +493,6 @@ func (o *InstallOptions) printNotes() {
 -> Uninstall KubeBlocks:
     kbcli kubeblocks uninstall
 `)
-	if o.Monitor {
-		fmt.Fprint(o.Out, `
--> To view the monitoring add-ons web console:
-    kbcli dashboard list        # list all monitoring web consoles
-    kbcli dashboard open <name> # open the web console in the default browser
-`)
-	} else {
-		fmt.Fprint(o.Out, `
-Note: Monitoring add-ons are not installed.
-    Use 'kbcli addon enable <addon-name>' to install them later.
-`)
-	}
 }
 
 func (o *InstallOptions) buildChart() *helm.InstallOpts {

cmd/kubeblocks/install_test.go

@@ -20,8 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package kubeblocks
 
 import (
-	"fmt"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
@@ -86,12 +84,10 @@ var _ = Describe("kubeblocks install", func() {
 				Dynamic:   testing.FakeDynamicClient(),
 			},
 			Version:         version.DefaultKubeBlocksVersion,
-			Monitor:         true,
 			CreateNamespace: true,
 		}
 		Expect(o.Install()).Should(HaveOccurred())
-		Expect(o.ValueOpts.Values).Should(HaveLen(1))
-		Expect(o.ValueOpts.Values[0]).To(Equal(fmt.Sprintf(kMonitorParam, true)))
+		Expect(o.ValueOpts.Values).Should(HaveLen(0))
 		Expect(o.installChart()).Should(HaveOccurred())
 		o.printNotes()
 	})

cmd/kubeblocks/uninstall.go

@@ -52,6 +52,11 @@ import (
 	"github.com/apecloud/kubeblocks/internal/cli/util/helm"
 )
 
+const (
+	kbBuiltinLabelKey   = "addons.extensions.kubeblocks.io"
+	kbBuiltinLabelValue = "true"
+)
+
 var (
 	uninstallExample = templates.Examples(`
 		# uninstall KubeBlocks
@@ -344,6 +349,15 @@ func checkResources(dynamic dynamic.Interface) error {
 		}
 
 		for _, item := range objList.Items {
+			labels := item.GetLabels()
+			if labels == nil {
+				crs[gvr.Resource] = append(crs[gvr.Resource], item.GetName())
+				continue
+			}
+			// skip builtin resources managed by KubeBlocks
+			if v, ok := labels[kbBuiltinLabelKey]; ok && v == kbBuiltinLabelValue {
+				continue
+			}
 			crs[gvr.Resource] = append(crs[gvr.Resource], item.GetName())
 		}
 	}

cmd/kubeblocks/upgrade.go

@@ -136,8 +136,6 @@ func (o *InstallOptions) Upgrade() error {
 
 	if !o.Quiet {
 		fmt.Fprintf(o.Out, "\nKubeBlocks has been upgraded %s SUCCESSFULLY!\n", msg)
-		// set monitor to true, so that we can print notes with monitor
-		o.Monitor = true
 		o.printNotes()
 	}
 	return nil

cmd/playground/init.go

@@ -449,25 +449,23 @@ func (o *initOptions) installKubeBlocks(k8sClusterName string) error {
 			Timeout:   o.Timeout,
 		},
 		Version: o.kbVersion,
-		Monitor: true,
 		Quiet:   true,
 		Check:   true,
 	}
 
+	// enable monitor components by default
+	insOpts.ValueOpts.Values = append(insOpts.ValueOpts.Values,
+		"prometheus.enabled=true",
+		"grafana.enabled=true",
+		"agamotto.enabled=true",
+	)
+
 	if o.cloudProvider == cp.Local {
 		insOpts.ValueOpts.Values = append(insOpts.ValueOpts.Values,
 			// use hostpath csi driver to support snapshot
 			"snapshot-controller.enabled=true",
 			"csi-hostpath-driver.enabled=true",
-
-			// disable the persistent volume of prometheus, if not, the prometheus
-			// will depend on the hostpath csi driver to create persistent
-			// volume, but the order of addon installation is not guaranteed which
-			// will cause the prometheus PVC pending forever.
-			"prometheus.server.persistentVolume.enabled=false",
-			"prometheus.server.statefulSet.enabled=false",
-			"prometheus.alertmanager.persistentVolume.enabled=false",
-			"prometheus.alertmanager.statefulSet.enabled=false")
+		)
 	} else if o.cloudProvider == cp.AWS {
 		insOpts.ValueOpts.Values = append(insOpts.ValueOpts.Values,
 			// enable aws-load-balancer-controller addon automatically on playground