upd telemetry

Author: kvaps

packages/system/cozystack-workload-controller/cmd/main.go

@@ -101,7 +101,7 @@ func main() {
 		Disabled:         disableTelemetry,
 		Endpoint:         telemetryEndpoint,
 		Interval:         interval,
-		CozyStackVersion: cozystackVersion,
+		CozystackVersion: cozystackVersion,
 	}
 
 	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
@@ -190,7 +190,12 @@ func main() {
 	}
 
 	// Initialize telemetry collector
-	collector := telemetry.NewCollector(mgr.GetClient(), &telemetryConfig)
+	collector, err := telemetry.NewCollector(mgr.GetClient(), &telemetryConfig, mgr.GetConfig())
+	if err != nil {
+		setupLog.Error(err, "unable to create telemetry collector")
+		os.Exit(1)
+	}
+
 	if err := mgr.Add(collector); err != nil {
 		setupLog.Error(err, "unable to set up telemetry collector")
 		os.Exit(1)

packages/system/cozystack-workload-controller/internal/telemetry/collector.go

@@ -10,6 +10,8 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/discovery"
+	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
@@ -18,18 +20,24 @@ import (
 
 // Collector handles telemetry data collection and sending
 type Collector struct {
-	client client.Client
-	config *Config
-	ticker *time.Ticker
-	stopCh chan struct{}
+	client          client.Client
+	discoveryClient discovery.DiscoveryInterface
+	config          *Config
+	ticker          *time.Ticker
+	stopCh          chan struct{}
 }
 
 // NewCollector creates a new telemetry collector
-func NewCollector(client client.Client, config *Config) *Collector {
-	return &Collector{
-		client: client,
-		config: config,
+func NewCollector(client client.Client, config *Config, kubeConfig *rest.Config) (*Collector, error) {
+	discoveryClient, err := discovery.NewDiscoveryClientForConfig(kubeConfig)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create discovery client: %w", err)
 	}
+	return &Collector{
+		client:          client,
+		discoveryClient: discoveryClient,
+		config:          config,
+	}, nil
 }
 
 // Start implements manager.Runnable
@@ -80,6 +88,14 @@ func (c *Collector) collect(ctx context.Context) {
 
 	clusterID := string(kubeSystemNS.UID)
 
+	var cozystackCM corev1.ConfigMap
+	if err := c.client.Get(ctx, types.NamespacedName{Namespace: "cozy-system", Name: "cozystack"}, &cozystackCM); err != nil {
+		logger.Error(err, "Failed to get cozystack configmap in cozy-system namespace")
+		return
+	}
+
+	bundle := cozystackCM.Data["bundle-name"]
+
 	// Get Kubernetes version from nodes
 	var nodeList corev1.NodeList
 	if err := c.client.List(ctx, &nodeList); err != nil {
@@ -90,13 +106,14 @@ func (c *Collector) collect(ctx context.Context) {
 	// Create metrics buffer
 	var metrics strings.Builder
 
-	// Add CozyStack info metric
+	// Add Cozystack info metric
 	if len(nodeList.Items) > 0 {
-		k8sVersion := nodeList.Items[0].Status.NodeInfo.KubeletVersion
+		k8sVersion, _ := c.discoveryClient.ServerVersion()
 		metrics.WriteString(fmt.Sprintf(
-			"cozystack_info{version=\"%s\",kubernetes_version=\"%s\"} 1\n",
-			c.config.CozyStackVersion,
+			"cozystack_cluster_info{version=\"%s\",kubernetes_version=\"%s\",bundle=\"%s\"} 1\n",
+			c.config.CozystackVersion,
 			k8sVersion,
+			bundle,
 		))
 	}
 
@@ -109,7 +126,7 @@ func (c *Collector) collect(ctx context.Context) {
 
 	for osKey, count := range nodeOSCount {
 		metrics.WriteString(fmt.Sprintf(
-			"nodes_count{os=\"%s\",kernel=\"%s\"} %d\n",
+			"cozystack_nodes{os=\"%s\",kernel=\"%s\"} %d\n",
 			osKey,
 			nodeList.Items[0].Status.NodeInfo.KernelVersion,
 			count,
@@ -125,8 +142,8 @@ func (c *Collector) collect(ctx context.Context) {
 
 	for _, monitor := range monitorList.Items {
 		metrics.WriteString(fmt.Sprintf(
-			"workload_count{uid=\"%s\",kind=\"%s\",type=\"%s\",version=\"%s\"} %d\n",
-			clusterID,
+			"cozystack_workload_replicas{uid=\"%s\",kind=\"%s\",type=\"%s\",version=\"%s\"} %d\n",
+			monitor.UID,
 			monitor.Spec.Kind,
 			monitor.Spec.Type,
 			monitor.Spec.Version,

packages/system/cozystack-workload-controller/internal/telemetry/config.go

@@ -12,8 +12,8 @@ type Config struct {
 	Endpoint string
 	// Interval between telemetry data collection
 	Interval time.Duration
-	// CozyStackVersion represents the current version of CozyStack
-	CozyStackVersion string
+	// CozystackVersion represents the current version of Cozystack
+	CozystackVersion string
 }
 
 // DefaultConfig returns default telemetry configuration
@@ -22,6 +22,6 @@ func DefaultConfig() *Config {
 		Disabled:         false,
 		Endpoint:         "https://telemetry.cozystack.io",
 		Interval:         15 * time.Minute,
-		CozyStackVersion: "unknown",
+		CozystackVersion: "unknown",
 	}
 }