Merge branch 'main' into b/allow-setting-beat.name

elastic · Dec 7, 2023 · 790a17d · 790a17d
2 parents 435d9a4 + a561db3
commit 790a17d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml
@@ -17,6 +17,13 @@ spec:
         enabled: true
     logging:
       level: debug
+    monitoring:
+      enabled: true
+      elasticsearch:
+        username: admin
+        password: changeme
+        hosts: [http://elasticsearch-es-http.default.svc:9200]
+        protocol: "http"
     output:
       elasticsearch:
         username: admin

diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml
@@ -7,6 +7,15 @@ spec:
   auth:
     fileRealm:
       - secretName: elasticsearch-admin
+  monitoring:
+    metrics:
+      elasticsearchRefs:
+        - name: elasticsearch
+          namespace: default
+    logs:
+      elasticsearchRefs:
+        - name: elasticsearch
+          namespace: default
   nodeSets:
   - name: default
     count: 1

diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml
@@ -12,6 +12,15 @@ spec:
     tls:
       selfSignedCertificate:
         disabled: true
+  monitoring:
+    metrics:
+      elasticsearchRefs:
+        - name: elasticsearch
+          namespace: default
+    logs:
+      elasticsearchRefs:
+        - name: elasticsearch
+          namespace: default
   podTemplate:
     spec:
       containers: