Add Stack Monitoring usage reporting (#4708) (#4711)

Author: thbkrkr

pkg/telemetry/telemetry.go

@@ -18,6 +18,7 @@ import (
 	kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1"
 	mapsv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/maps/v1alpha1"
 	"github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler"
+	"github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/monitoring"
 	"github.com/elastic/cloud-on-k8s/pkg/controller/kibana"
 	"github.com/elastic/cloud-on-k8s/pkg/license"
 	"github.com/elastic/cloud-on-k8s/pkg/utils/k8s"
@@ -29,9 +30,11 @@ import (
 )
 
 const (
-	autoscaledResourceCount = "autoscaled_resource_count"
-	resourceCount           = "resource_count"
-	podCount                = "pod_count"
+	autoscaledResourceCount     = "autoscaled_resource_count"
+	resourceCount               = "resource_count"
+	podCount                    = "pod_count"
+	stackMonitoringLogsCount    = "stack_monitoring_logs_count"
+	stackMonitoringMetricsCount = "stack_monitoring_metrics_count"
 
 	timestampFieldName = "timestamp"
 )
@@ -192,11 +195,18 @@ func esStats(k8sClient k8s.Client, managedNamespaces []string) (string, interfac
 		}
 
 		for _, es := range esList.Items {
+			es := es
 			stats[resourceCount]++
 			stats[podCount] += es.Status.AvailableNodes
 			if es.IsAutoscalingDefined() {
 				stats[autoscaledResourceCount]++
 			}
+			if monitoring.IsLogsDefined(&es) {
+				stats[stackMonitoringLogsCount]++
+			}
+			if monitoring.IsMetricsDefined(&es) {
+				stats[stackMonitoringMetricsCount]++
+			}
 		}
 	}
 	return "elasticsearches", stats, nil

pkg/telemetry/telemetry_test.go

@@ -155,6 +155,21 @@ func TestNewReporter(t *testing.T) {
 				AvailableNodes: 6,
 			},
 		},
+		&esv1.Elasticsearch{
+			ObjectMeta: metav1.ObjectMeta{
+				Namespace: "ns1",
+				Name:      "monitored",
+			},
+			Spec: esv1.ElasticsearchSpec{
+				Monitoring: esv1.Monitoring{
+					Logs:    esv1.LogsMonitoring{ElasticsearchRefs: []commonv1.ObjectSelector{{Name: "monitoring"}}},
+					Metrics: esv1.MetricsMonitoring{ElasticsearchRefs: []commonv1.ObjectSelector{{Name: "monitoring"}}},
+				},
+			},
+			Status: esv1.ElasticsearchStatus{
+				AvailableNodes: 1,
+			},
+		},
 		&apmv1.ApmServer{
 			ObjectMeta: metav1.ObjectMeta{
 				Namespace: "ns1",
@@ -321,8 +336,10 @@ func TestNewReporter(t *testing.T) {
       resource_count: 2
     elasticsearches:
       autoscaled_resource_count: 1
-      pod_count: 9
-      resource_count: 2
+      pod_count: 10
+      resource_count: 3
+      stack_monitoring_logs_count: 1
+      stack_monitoring_metrics_count: 1
     enterprisesearches:
       pod_count: 3
       resource_count: 1