fix(internal/circonus): Add GetPlatform func, remove platform info from GetVersion

Fix GetVersion to only return cluster version
Add new function to return cluster platform (GetPlatform)
Fix all references to GetVersion and (Check).clusterVers to properly
use GetVersion and GetPlatform where needed

issue #CIRC-8497

Fix logic in creating default rulesets and metric filters to return
required vals and determine cluster version before creating them.

* Tags: platform version clusterVers check

Author: aesca1er

internal/circonus/check.go

@@ -57,6 +57,7 @@ type Check struct {
 	checkBundleCID       string
 	clusterTag           string
 	clusterVers          string
+	clusterPlatform      string
 	submissionURL        string
 	log                  zerolog.Logger
 	metricFilters        []MetricFilter
@@ -84,6 +85,10 @@ func NewCheck(parentLogger zerolog.Logger, cfg *config.Circonus, clusterCfg *con
 	if err != nil {
 		return nil, err
 	}
+	c.clusterPlatform, err = k8s.GetPlatform(clusterCfg)
+	if err != nil {
+		return nil, err
+	}
 
 	// output debug messages for hidden settings which are not DEFAULT
 	if cfg.Base64Tags != defaults.Base64Tags {

internal/cluster/cluster.go

@@ -304,9 +304,14 @@ func (c *Cluster) collect(ctx context.Context, dynamicCollectors *dc.DC) {
 	{ // get api/cluster version/platform
 		ver, err := k8s.GetVersion(&c.cfg)
 		if err != nil {
-			c.logger.Warn().Err(err).Msg("getting version api/cluster information")
+			c.logger.Warn().Err(err).Msg("getting api/cluster version information")
+		}
+
+		plat, err := k8s.GetPlatform(&c.cfg)
+		if err != nil {
+			c.logger.Warn().Err(err).Msg("getting api/cluster platform information")
 		} else {
-			c.check.AddText("collect_k8s_ver", cgm.Tags{cgm.Tag{Category: "source", Value: release.NAME}}, ver)
+			c.check.AddText("collect_k8s_ver", cgm.Tags{cgm.Tag{Category: "source", Value: release.NAME}}, ver+" "+plat)
 		}
 	}
 

internal/k8s/k8s.go

@@ -41,6 +41,7 @@ func GetClient(clusterConfig *config.Cluster) (*kubernetes.Clientset, error) {
 	return clientset, nil
 }
 
+// GetVersion gets the cluster version
 func GetVersion(clusterConfig *config.Cluster) (string, error) {
 	clientset, err := GetClient(clusterConfig)
 	if err != nil {
@@ -59,5 +60,27 @@ func GetVersion(clusterConfig *config.Cluster) (string, error) {
 		return "", err
 	}
 
-	return ver.GitVersion + " " + ver.Platform, nil
+	return ver.GitVersion, nil
+}
+
+// GetPlatform gets the cluster platform
+func GetPlatform(clusterConfig *config.Cluster) (string, error) {
+	clientset, err := GetClient(clusterConfig)
+	if err != nil {
+		return "", err
+	}
+	req := clientset.CoreV1().RESTClient().Get().RequestURI("/version")
+	res := req.Do()
+
+	data, err := res.Raw()
+	if err != nil {
+		return "", err
+	}
+
+	var ver apimachineryversion.Info
+	if err := json.Unmarshal(data, &ver); err != nil {
+		return "", err
+	}
+
+	return ver.Platform, nil
 }