Skip to content

Commit

Permalink
Remove additional spec references in Helm eck-stack chart. (elastic#8286
Browse files Browse the repository at this point in the history
) (elastic#8298)

Signed-off-by: Michael Montgomery <[email protected]>
(cherry picked from commit 1e644a9)
naemono authored Dec 5, 2024

Verified

This commit was signed with the committer’s verified signature.
DRSchlaubi Michael Rittmeister
1 parent b61eb1e commit 48d3b21
Showing 2 changed files with 54 additions and 56 deletions.
101 changes: 50 additions & 51 deletions deploy/eck-stack/examples/agent/fleet-agents.yaml
Original file line number Diff line number Diff line change
@@ -24,58 +24,57 @@ eck-kibana:
#
fullnameOverride: kibana

spec:
# Reference to ECK-managed Elasticsearch instance, ideally from {{ "elasticsearch.fullname" }}
#
elasticsearchRef:
name: elasticsearch
# Reference to ECK-managed Elasticsearch instance, ideally from {{ "elasticsearch.fullname" }}
#
elasticsearchRef:
name: elasticsearch

config:
# Note that these are specific to the namespace into which this example is installed, and are
# using `elastic-stack` as configured here and detailed in the README when installing:
#
# `helm install es-kb-quickstart elastic/eck-stack -n elastic-stack`
#
# If installed outside of the `elastic-stack` namespace, the following 2 lines need modification.
xpack.fleet.agents.elasticsearch.hosts: ["https://elasticsearch-es-http.elastic-stack.svc:9200"]
xpack.fleet.agents.fleet_server.hosts: ["https://fleet-server-agent-http.elastic-stack.svc:8220"]
xpack.fleet.packages:
- name: system
version: latest
- name: elastic_agent
version: latest
- name: fleet_server
version: latest
- name: kubernetes
version: latest
xpack.fleet.agentPolicies:
- name: Fleet Server on ECK policy
id: eck-fleet-server
namespace: default
is_managed: true
monitoring_enabled:
- logs
- metrics
package_policies:
- name: fleet_server-1
id: fleet_server-1
package:
name: fleet_server
- name: Elastic Agent on ECK policy
id: eck-agent
namespace: default
is_managed: true
monitoring_enabled:
- logs
- metrics
unenroll_timeout: 900
package_policies:
- package:
name: system
name: system-1
- package:
name: kubernetes
name: kubernetes-1
config:
# Note that these are specific to the namespace into which this example is installed, and are
# using `elastic-stack` as configured here and detailed in the README when installing:
#
# `helm install es-kb-quickstart elastic/eck-stack -n elastic-stack`
#
# If installed outside of the `elastic-stack` namespace, the following 2 lines need modification.
xpack.fleet.agents.elasticsearch.hosts: ["https://elasticsearch-es-http.elastic-stack.svc:9200"]
xpack.fleet.agents.fleet_server.hosts: ["https://fleet-server-agent-http.elastic-stack.svc:8220"]
xpack.fleet.packages:
- name: system
version: latest
- name: elastic_agent
version: latest
- name: fleet_server
version: latest
- name: kubernetes
version: latest
xpack.fleet.agentPolicies:
- name: Fleet Server on ECK policy
id: eck-fleet-server
namespace: default
is_managed: true
monitoring_enabled:
- logs
- metrics
package_policies:
- name: fleet_server-1
id: fleet_server-1
package:
name: fleet_server
- name: Elastic Agent on ECK policy
id: eck-agent
namespace: default
is_managed: true
monitoring_enabled:
- logs
- metrics
unenroll_timeout: 900
package_policies:
- package:
name: system
name: system-1
- package:
name: kubernetes
name: kubernetes-1

eck-agent:
enabled: true
9 changes: 4 additions & 5 deletions deploy/eck-stack/values.yaml
Original file line number Diff line number Diff line change
@@ -14,11 +14,10 @@ eck-elasticsearch:
#
eck-kibana:
enabled: true
spec:
# This is also adjusting the kibana reference to the elasticsearch resource named previously so that
# both the eck-elasticsearch and the eck-kibana chart work together by default in the eck-stack chart.
elasticsearchRef:
name: elasticsearch
# This is also adjusting the kibana reference to the elasticsearch resource named previously so that
# both the eck-elasticsearch and the eck-kibana chart work together by default in the eck-stack chart.
elasticsearchRef:
name: elasticsearch

# If enabled, will use the eck-agent chart and deploy an Elastic Agent instance.
#

0 comments on commit 48d3b21

Please sign in to comment.