diff --git a/main.go b/main.go index 43d3245..26ecd0b 100644 --- a/main.go +++ b/main.go @@ -20,11 +20,11 @@ import ( "errors" "fmt" "os" + "sync" pb "pb/cmd" "pb/pkg/analytics" "pb/pkg/config" - "sync" "github.com/spf13/cobra" ) @@ -188,8 +188,8 @@ var query = &cobra.Command{ var cluster = &cobra.Command{ Use: "cluster", - Short: "Cluster operations for parseable.", - Long: "\nCluster operations for parseable cluster on kubernetes.", + Short: "Cluster operations for Parseable.", + Long: "\nCluster operations for Parseable cluster on Kubernetes.", PersistentPreRunE: combinedPreRun, PersistentPostRun: func(cmd *cobra.Command, args []string) { if os.Getenv("PB_ANALYTICS") == "disable" { @@ -206,7 +206,7 @@ var cluster = &cobra.Command{ var list = &cobra.Command{ Use: "list", Short: "List parseable on kubernetes cluster", - Long: "\nlist command is used to list parseable oss installations.", + Long: "\nlist command is used to list Parseable oss installations.", PersistentPreRunE: combinedPreRun, PersistentPostRun: func(cmd *cobra.Command, args []string) { if os.Getenv("PB_ANALYTICS") == "disable" { @@ -222,8 +222,8 @@ var list = &cobra.Command{ var show = &cobra.Command{ Use: "show", - Short: "Show outputs values defined when installing parseable on kubernetes cluster", - Long: "\nshow command is used to get values in parseable.", + Short: "Show outputs values defined when installing Parseable on kubernetes cluster", + Long: "\nshow command is used to get values in Parseable.", PersistentPreRunE: combinedPreRun, PersistentPostRun: func(cmd *cobra.Command, args []string) { if os.Getenv("PB_ANALYTICS") == "disable" { @@ -239,8 +239,8 @@ var show = &cobra.Command{ var uninstall = &cobra.Command{ Use: "uninstall", - Short: "Uninstall parseable on kubernetes cluster", - Long: "\nuninstall command is used to uninstall parseable oss/enterprise on k8s cluster..", + Short: "Uninstall Parseable on kubernetes cluster", + Long: "\nuninstall command is used to uninstall Parseable oss/enterprise on k8s cluster.", PersistentPreRunE: combinedPreRun, PersistentPostRun: func(cmd *cobra.Command, args []string) { if os.Getenv("PB_ANALYTICS") == "disable" { diff --git a/pkg/installer/plans.go b/pkg/installer/plans.go index cb86976..801980f 100644 --- a/pkg/installer/plans.go +++ b/pkg/installer/plans.go @@ -31,45 +31,45 @@ type Plan struct { CPUAndMemorySpecs string CPU string Memory string + Mode string + Description string } // Plans define the plans with clear CPU and memory specs for consumption var Plans = map[string]Plan{ "Playground": { Name: "Playground", - IngestionSpeed: "100 events/sec", - PerDayIngestion: "~1GB", - QueryPerformance: "Basic performance", - CPUAndMemorySpecs: "1 CPUs, 1GB RAM", + Description: "Suitable for testing and PoC", + IngestionSpeed: "Up to 5 MiB/sec", + CPUAndMemorySpecs: "1 vCPU, 1Gi RAM", CPU: "1", Memory: "1Gi", + Mode: "Standalone", }, "Small": { Name: "Small", - IngestionSpeed: "1000 events/sec", - PerDayIngestion: "~10GB", - QueryPerformance: "Basic performance", - CPUAndMemorySpecs: "2 CPUs, 4GB RAM", + Description: "Suitable for production grade, small volume workloads", + IngestionSpeed: "Up to 20 MiB/sec", + CPUAndMemorySpecs: "2 vCPUs, 4Gi RAM", CPU: "2", Memory: "4Gi", + Mode: "Distributed (1 Query pod, 3 Ingest pod)", }, "Medium": { Name: "Medium", - IngestionSpeed: "10,000 events/sec", - PerDayIngestion: "~100GB", - QueryPerformance: "Moderate performance", - CPUAndMemorySpecs: "4 CPUs, 16GB RAM", + IngestionSpeed: "Up to 50 MiB/sec", + CPUAndMemorySpecs: "4 vCPUs, 16Gi RAM", CPU: "4", - Memory: "16Gi", + Memory: "18Gi", + Mode: "Distributed (1 Query pod, 3 Ingest pod)", }, "Large": { Name: "Large", - IngestionSpeed: "100,000 events/sec", - PerDayIngestion: "~1TB", - QueryPerformance: "High performance", - CPUAndMemorySpecs: "8 CPUs, 32GB RAM", + IngestionSpeed: "Up to 100 MiB/sec", + CPUAndMemorySpecs: "8 vCPUs, 32Gi RAM", CPU: "8", - Memory: "32Gi", + Memory: "16Gi", + Mode: "Distributed (1 Query pod, 3 Ingest pod)", }, } @@ -84,16 +84,15 @@ func promptUserPlanSelection() (Plan, error) { // Custom template for displaying plans templates := &promptui.SelectTemplates{ Label: "{{ . }}", - Active: "▶ {{ .Name | yellow }} ({{ .IngestionSpeed | cyan }})", - Inactive: " {{ .Name | yellow }} ({{ .IngestionSpeed | cyan }})", + Active: "▶ {{ .Name | yellow }} ", + Inactive: " {{ .Name | yellow }} ", Selected: "{{ `Selected plan:` | green }} '{{ .Name | green }}' ✔ ", Details: ` --------- Plan Details ---------- {{ "Plan:" | faint }} {{ .Name }} {{ "Ingestion Speed:" | faint }} {{ .IngestionSpeed }} -{{ "Per Day Ingestion:" | faint }} {{ .PerDayIngestion }} -{{ "Query Performance:" | faint }} {{ .QueryPerformance }} -{{ "CPU & Memory:" | faint }} {{ .CPUAndMemorySpecs }}`, +{{ "Infrastructure:" | faint }} {{ .Mode }} +{{ "CPU & Memory:" | faint }} {{ .CPUAndMemorySpecs }} per pod`, } // Add a note about the default plan in the label