feat: forward agent providers configuration for fleet mode

elastic · Nov 1, 2024 · 6770601 · 6770601
1 parent 68be8a7
commit 6770601
Show file tree

Hide file tree

Showing 9 changed files with 183 additions and 186 deletions.
diff --git a/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
@@ -62,19 +62,6 @@ stringData:
         type: elasticsearch
         username: elastic
     secret_references: []
-    agent:
-      monitoring:
-        enabled: true
-        logs: true
-        metrics: true
-        namespace: default
-        use_output: default
-    providers:
-      kubernetes:
-        node: ${NODE_NAME}
-        scope: cluster
-      kubernetes_leaderelection:
-        enabled: true
     inputs:
       - data_stream:
           namespace: default
@@ -94,6 +81,19 @@ stringData:
           - /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
         type: kubernetes/metrics
         use_output: default
+    agent:
+      monitoring:
+        enabled: true
+        logs: true
+        metrics: true
+        namespace: default
+        use_output: default
+    providers:
+      kubernetes:
+        node: ${NODE_NAME}
+        scope: cluster
+      kubernetes_leaderelection:
+        enabled: true
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -119,18 +119,6 @@ stringData:
         type: elasticsearch
         username: elastic
     secret_references: []
-    agent:
-      monitoring:
-        enabled: true
-        logs: true
-        metrics: true
-        namespace: default
-        use_output: default
-    providers:
-      kubernetes:
-        enabled: false
-      kubernetes_leaderelection:
-        enabled: false
     inputs:
       - data_stream:
           namespace: default
@@ -388,6 +376,18 @@ stringData:
           period: 10s
         type: kubernetes/metrics
         use_output: default
+    agent:
+      monitoring:
+        enabled: true
+        logs: true
+        metrics: true
+        namespace: default
+        use_output: default
+    providers:
+      kubernetes:
+        enabled: false
+      kubernetes_leaderelection:
+        enabled: false
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -413,19 +413,6 @@ stringData:
         type: elasticsearch
         username: elastic
     secret_references: []
-    agent:
-      monitoring:
-        enabled: true
-        logs: true
-        metrics: true
-        namespace: default
-        use_output: default
-    providers:
-      kubernetes:
-        node: ${NODE_NAME}
-        scope: node
-      kubernetes_leaderelection:
-        enabled: false
     inputs:
       - data_stream:
           namespace: default
@@ -571,6 +558,19 @@ stringData:
           ssl.verification_mode: none
         type: kubernetes/metrics
         use_output: default
+    agent:
+      monitoring:
+        enabled: true
+        logs: true
+        metrics: true
+        namespace: default
+        use_output: default
+    providers:
+      kubernetes:
+        node: ${NODE_NAME}
+        scope: node
+      kubernetes_leaderelection:
+        enabled: false
 ---
 # Source: elastic-agent/templates/agent/cluster-role.yaml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -1089,7 +1089,7 @@ spec:
       labels:
         name: agent-pernode-example
       annotations:
-        checksum/config: 53aa4ccc3e8557125fecf738e70722e2aaa1199ee79a823f684a9d4a296af7b0
+        checksum/config: 8a63bcd6f0075a7f9a76df873aeb32c21a97343f33f83f176d33e9a813d2b61b
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet
@@ -1209,7 +1209,7 @@ spec:
       labels:
         name: agent-clusterwide-example
       annotations:
-        checksum/config: 73527b0aad319ef33239ef3c862820c5ee5cafb42e2ce164049646791b69ec68
+        checksum/config: 18d32ecd855b070361e0fb669b432c5064ef150156713b4f62f813cc7ea71ad2
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet
@@ -1290,7 +1290,7 @@ spec:
       labels:
         name: agent-ksmsharded-example
       annotations:
-        checksum/config: 4ec2b2ef4d3c5c103e79e47a45d4b3b4f9f774e85293f9a5b2d56556025f1d2d
+        checksum/config: fd239221a3952ee71cb20cc03c270a1061689e8daaef40ed2f21279e107c2323
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet

diff --git a/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
@@ -62,19 +62,6 @@ stringData:
         type: elasticsearch
         username: elastic
     secret_references: []
-    agent:
-      monitoring:
-        enabled: true
-        logs: true
-        metrics: true
-        namespace: default
-        use_output: default
-    providers:
-      kubernetes:
-        node: ${NODE_NAME}
-        scope: cluster
-      kubernetes_leaderelection:
-        enabled: true
     inputs:
       - data_stream:
           namespace: default
@@ -94,6 +81,19 @@ stringData:
           - /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
         type: kubernetes/metrics
         use_output: default
+    agent:
+      monitoring:
+        enabled: true
+        logs: true
+        metrics: true
+        namespace: default
+        use_output: default
+    providers:
+      kubernetes:
+        node: ${NODE_NAME}
+        scope: cluster
+      kubernetes_leaderelection:
+        enabled: true
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -119,18 +119,6 @@ stringData:
         type: elasticsearch
         username: elastic
     secret_references: []
-    agent:
-      monitoring:
-        enabled: true
-        logs: true
-        metrics: true
-        namespace: default
-        use_output: default
-    providers:
-      kubernetes:
-        enabled: false
-      kubernetes_leaderelection:
-        enabled: false
     inputs:
       - data_stream:
           namespace: default
@@ -388,6 +376,18 @@ stringData:
           period: 10s
         type: kubernetes/metrics
         use_output: default
+    agent:
+      monitoring:
+        enabled: true
+        logs: true
+        metrics: true
+        namespace: default
+        use_output: default
+    providers:
+      kubernetes:
+        enabled: false
+      kubernetes_leaderelection:
+        enabled: false
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -413,21 +413,6 @@ stringData:
         type: elasticsearch
         username: elastic
     secret_references: []
-    agent:
-      monitoring:
-        enabled: true
-        logs: true
-        metrics: true
-        namespace: default
-        use_output: default
-    providers:
-      kubernetes:
-        hints:
-          enabled: true
-        node: ${NODE_NAME}
-        scope: node
-      kubernetes_leaderelection:
-        enabled: false
     inputs:
       - data_stream:
           namespace: default
@@ -573,6 +558,21 @@ stringData:
           ssl.verification_mode: none
         type: kubernetes/metrics
         use_output: default
+    agent:
+      monitoring:
+        enabled: true
+        logs: true
+        metrics: true
+        namespace: default
+        use_output: default
+    providers:
+      kubernetes:
+        hints:
+          enabled: true
+        node: ${NODE_NAME}
+        scope: node
+      kubernetes_leaderelection:
+        enabled: false
 ---
 # Source: elastic-agent/templates/agent/cluster-role.yaml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -1091,7 +1091,7 @@ spec:
       labels:
         name: agent-pernode-example
       annotations:
-        checksum/config: 21fb7e317577410096de8d8e0fb03b32ad2e406b549f75085ae6907d38678e46
+        checksum/config: 72f0ef2c907f2d0deea78734463e196b1b8407f920b633979e6bb239ff857267
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet
@@ -1122,10 +1122,10 @@ spec:
           name: external-inputs
         - name: agent-data
           hostPath:
-            
+
             path: /etc/elastic-agent/default/agent-pernode-example/state
             type: DirectoryOrCreate
-        
+
         - name: config
           secret:
             defaultMode: 0444
@@ -1236,7 +1236,7 @@ spec:
       labels:
         name: agent-clusterwide-example
       annotations:
-        checksum/config: 73527b0aad319ef33239ef3c862820c5ee5cafb42e2ce164049646791b69ec68
+        checksum/config: 18d32ecd855b070361e0fb669b432c5064ef150156713b4f62f813cc7ea71ad2
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet
@@ -1247,7 +1247,7 @@ spec:
       volumes:
         - emptyDir: {}
           name: agent-data
-        
+
         - name: config
           secret:
             defaultMode: 0444
@@ -1317,7 +1317,7 @@ spec:
       labels:
         name: agent-ksmsharded-example
       annotations:
-        checksum/config: 4ec2b2ef4d3c5c103e79e47a45d4b3b4f9f774e85293f9a5b2d56556025f1d2d
+        checksum/config: fd239221a3952ee71cb20cc03c270a1061689e8daaef40ed2f21279e107c2323
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet
@@ -1328,7 +1328,7 @@ spec:
       volumes:
         - emptyDir: {}
           name: agent-data
-        
+
         - name: config
           secret:
             defaultMode: 0444

diff --git a/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml
@@ -36,19 +36,6 @@ stringData:
         type: elasticsearch
         username: elastic
     secret_references: []
-    agent:
-      monitoring:
-        enabled: true
-        logs: true
-        metrics: true
-        namespace: default
-        use_output: default
-    providers:
-      kubernetes:
-        node: ${NODE_NAME}
-        scope: node
-      kubernetes_leaderelection:
-        enabled: false
     inputs:
       - data_stream:
           namespace: default
@@ -104,6 +91,19 @@ stringData:
           prospector.scanner.symlinks: true
         type: filestream
         use_output: default
+    agent:
+      monitoring:
+        enabled: true
+        logs: true
+        metrics: true
+        namespace: default
+        use_output: default
+    providers:
+      kubernetes:
+        node: ${NODE_NAME}
+        scope: node
+      kubernetes_leaderelection:
+        enabled: false
 ---
 # Source: elastic-agent/templates/agent/cluster-role.yaml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -227,7 +227,7 @@ spec:
       labels:
         name: agent-pernode-example
       annotations:
-        checksum/config: 4de2216224a483ae1355aeec668894f764edc48bd3481d8fbc65f67eedc1b336
+        checksum/config: bb84f05ca178fdc34ba9293f7ab3f3ad55c70f8b63522f488b13aad6e8ef8bae
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet
@@ -256,10 +256,10 @@ spec:
           name: var-lib
         - name: agent-data
           hostPath:
-            
+
             path: /etc/elastic-agent/default/agent-pernode-example/state
             type: DirectoryOrCreate
-        
+
         - name: config
           secret:
             defaultMode: 0444