Report EnterpriseSearch memory usage (#4499) (#4503)

Author: barkbay

pkg/controller/enterprisesearch/pod.go

@@ -19,6 +19,7 @@ import (
 )
 
 const (
+	EnvJavaOpts         = "JAVA_OPTS"
 	HTTPPort            = 3002
 	DefaultJavaOpts     = "-Xms3500m -Xmx3500m"
 	ConfigHashLabelName = "enterprisesearch.k8s.elastic.co/config-hash"
@@ -36,7 +37,7 @@ var (
 		},
 	}
 	DefaultEnv = []corev1.EnvVar{
-		{Name: "JAVA_OPTS", Value: DefaultJavaOpts},
+		{Name: EnvJavaOpts, Value: DefaultJavaOpts},
 	}
 	ReadinessProbe = corev1.Probe{
 		FailureThreshold:    3,

pkg/license/aggregator.go

@@ -13,10 +13,12 @@ import (
 
 	apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1"
 	esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1"
+	entv1 "github.com/elastic/cloud-on-k8s/pkg/apis/enterprisesearch/v1"
 	kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1"
 	"github.com/elastic/cloud-on-k8s/pkg/controller/apmserver"
 	"github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/nodespec"
 	essettings "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings"
+	"github.com/elastic/cloud-on-k8s/pkg/controller/enterprisesearch"
 	"github.com/elastic/cloud-on-k8s/pkg/controller/kibana"
 	"github.com/elastic/cloud-on-k8s/pkg/utils/k8s"
 	"github.com/pkg/errors"
@@ -39,6 +41,7 @@ func (a Aggregator) AggregateMemory() (resource.Quantity, error) {
 		a.aggregateElasticsearchMemory,
 		a.aggregateKibanaMemory,
 		a.aggregateApmServerMemory,
+		a.aggregateEnterpriseSearchMemory,
 	} {
 		memory, err := f()
 		if err != nil {
@@ -79,6 +82,33 @@ func (a Aggregator) aggregateElasticsearchMemory() (resource.Quantity, error) {
 	return total, nil
 }
 
+func (a Aggregator) aggregateEnterpriseSearchMemory() (resource.Quantity, error) {
+	var entList entv1.EnterpriseSearchList
+	err := a.client.List(context.Background(), &entList)
+	if err != nil {
+		return resource.Quantity{}, errors.Wrap(err, "failed to aggregate Enterprise Search memory")
+	}
+
+	var total resource.Quantity
+	for _, ent := range entList.Items {
+		mem, err := containerMemLimits(
+			ent.Spec.PodTemplate.Spec.Containers,
+			entv1.EnterpriseSearchContainerName,
+			enterprisesearch.EnvJavaOpts, memFromJavaOpts,
+			enterprisesearch.DefaultMemoryLimits,
+		)
+		if err != nil {
+			return resource.Quantity{}, errors.Wrap(err, "failed to aggregate Enterprise Search memory")
+		}
+
+		total.Add(multiply(mem, ent.Spec.Count))
+		log.V(1).Info("Collecting", "namespace", ent.Namespace, "ent_name", ent.Name,
+			"memory", mem.String(), "count", ent.Spec.Count)
+	}
+
+	return total, nil
+}
+
 func (a Aggregator) aggregateKibanaMemory() (resource.Quantity, error) {
 	var kbList kbv1.KibanaList
 	err := a.client.List(context.Background(), &kbList)

pkg/license/aggregator_test.go

@@ -13,6 +13,7 @@ import (
 
 	apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1"
 	esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1"
+	entv1 "github.com/elastic/cloud-on-k8s/pkg/apis/enterprisesearch/v1"
 	kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1"
 	"github.com/elastic/cloud-on-k8s/pkg/utils/k8s"
 	"github.com/stretchr/testify/assert"
@@ -143,7 +144,7 @@ func TestAggregator(t *testing.T) {
 
 	val, err := aggregator.AggregateMemory()
 	require.NoError(t, err)
-	require.Equal(t, 324.1705472, inGB(val))
+	require.Equal(t, 349.940350976, inGB(val))
 }
 
 func readObjects(t *testing.T, filePath string) []runtime.Object {
@@ -153,6 +154,7 @@ func readObjects(t *testing.T, filePath string) []runtime.Object {
 	scheme.AddKnownTypes(esv1.GroupVersion, &esv1.Elasticsearch{}, &esv1.ElasticsearchList{})
 	scheme.AddKnownTypes(kbv1.GroupVersion, &kbv1.Kibana{}, &kbv1.KibanaList{})
 	scheme.AddKnownTypes(apmv1.GroupVersion, &apmv1.ApmServer{}, &apmv1.ApmServerList{})
+	scheme.AddKnownTypes(entv1.GroupVersion, &entv1.EnterpriseSearch{}, &entv1.EnterpriseSearchList{})
 	decoder := serializer.NewCodecFactory(scheme).UniversalDeserializer()
 
 	f, err := os.Open(filePath)

pkg/license/testdata/stack.yaml

@@ -124,3 +124,23 @@ spec:
               memory: 2Gi
             limits:
               memory: 2Gi
+---
+apiVersion: enterprisesearch.k8s.elastic.co/v1
+kind: EnterpriseSearch
+metadata:
+  name: enterprise-search-quickstart
+spec:
+  count: 3
+  podTemplate:
+    spec:
+      containers:
+        - name: enterprise-search
+          resources:
+            requests:
+              cpu: 3
+              memory: 8Gi
+            limits:
+              memory: 8Gi
+          env:
+            - name: JAVA_OPTS
+              value: -Xms7500m -Xmx7500m