Added oss to the appropriate locations to identify the oss platform

hiroshinishio · Feb 27, 2018 · 55bbba2 · 55bbba2
1 parent 320de87
commit 55bbba2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/client/v1/client.go b/client/v1/client.go
@@ -2329,6 +2329,7 @@ type DebugVars struct {
 	NumTasks         int                    `json:"num_tasks"`
 	Memstats         map[string]interface{} `json:"memstats"`
 	Version          string                 `json:"version"`
+	Product          string                 `json:"product"`
 }
 
 type Stat struct {

diff --git a/cmd/kapacitor/main.go b/cmd/kapacitor/main.go
@@ -2151,6 +2151,7 @@ func doStats(args []string) error {
 		fmt.Fprintf(os.Stdout, outFmtNum, "Tasks:", vars.NumTasks)
 		fmt.Fprintf(os.Stdout, outFmtNum, "Enabled Tasks:", vars.NumEnabledTasks)
 		fmt.Fprintf(os.Stdout, outFmtNum, "Subscriptions:", vars.NumSubscriptions)
+		fmt.Fprintf(os.Stdout, outFmtStr, "Product:", vars.Product)
 		fmt.Fprintf(os.Stdout, outFmtStr, "Version:", vars.Version)
 	case "ingress":
 		maxDB := 8  // len("Database")
@@ -2219,7 +2220,7 @@ func versionUsage() {
 }
 
 func doVersion(args []string) error {
-	fmt.Fprintf(os.Stdout, "Kapacitor %s (git: %s %s)\n", version, branch, commit)
+	fmt.Fprintf(os.Stdout, "Kapacitor oss %s (git: %s %s)\n", version, branch, commit)
 	return nil
 }
 

diff --git a/cmd/kapacitord/main.go b/cmd/kapacitord/main.go
@@ -198,7 +198,7 @@ func (cmd *VersionCommand) Run(args ...string) error {
 	}
 
 	// Print version info.
-	fmt.Fprintf(cmd.Stdout, "Kapacitor %s (git: %s %s)\n", version, branch, commit)
+	fmt.Fprintf(cmd.Stdout, "Kapacitor oss version %s (git: %s %s)\n", version, branch, commit)
 
 	return nil
 }

diff --git a/server/vars/vars.go b/server/vars/vars.go
@@ -23,7 +23,7 @@ const (
 	UptimeVarName = "uptime"
 
 	// The name of the product
-	Product = "kapacitor"
+	Product = "kapacitor oss"
 )
 
 var (