diff --git a/README.md b/README.md index 1f2b147ac28..20d0ef72038 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ in the [observability-docs](https://github.com/elastic/observability-docs) repo. ### Changelog -The changelog for the Elastic Agent is generated and maintained using the [elastic-agent-changelog-tool](https://github.com/elastic/elastic-agent-changelog-tool). Read the [installation](https://github.com/elastic/elastic-agent-changelog-tool/blob/8.10/docs/install.md) -and [usage](https://github.com/elastic/elastic-agent-changelog-tool/blob/8.10/docs/usage.md#im-a-developer) instructions to get started. +The changelog for the Elastic Agent is generated and maintained using the [elastic-agent-changelog-tool](https://github.com/elastic/elastic-agent-changelog-tool). Read the [installation](https://github.com/elastic/elastic-agent-changelog-tool/blob/main/docs/install.md) +and [usage](https://github.com/elastic/elastic-agent-changelog-tool/blob/main/docs/usage.md#im-a-developer) instructions to get started. The changelog tool produces fragement files that are consolidated to generate a changelog for each release. Each PR containing a change with user impact (new feature, bug fix, etc.) must contain a changelog fragement describing the change. There is a GitHub action in CI that will fail @@ -36,7 +36,7 @@ pr: https://github.com/elastic/elastic-agent/pull/823 Prerequisites: - installed [mage](https://github.com/magefile/mage) - [Docker](https://docs.docker.com/get-docker/) -- [X-pack](https://github.com/elastic/beats/tree/8.10/x-pack) to pre-exist in the parent folder of the local Git repository checkout +- [X-pack](https://github.com/elastic/beats/tree/main/x-pack) to pre-exist in the parent folder of the local Git repository checkout - [elastic-agent-changelog-tool](https://github.com/elastic/elastic-agent-changelog-tool) to add changelog fragments for changelog generation To build a local version of the agent for development, run the command below. The following platforms are supported: @@ -89,10 +89,10 @@ for the standard variant. ### Testing Elastic Agent on Kubernetes #### Prerequisites -- create kubernetes cluster using kind, check [here](https://github.com/elastic/beats/blob/8.10/metricbeat/module/kubernetes/_meta/test/docs/README.md) for details -- deploy kube-state-metrics, check [here](https://github.com/elastic/beats/blob/8.10/metricbeat/module/kubernetes/_meta/test/docs/README.md) for details +- create kubernetes cluster using kind, check [here](https://github.com/elastic/beats/blob/main/metricbeat/module/kubernetes/_meta/test/docs/README.md) for details +- deploy kube-state-metrics, check [here](https://github.com/elastic/beats/blob/main/metricbeat/module/kubernetes/_meta/test/docs/README.md) for details - deploy required infrastructure: - - for elastic agent in standalone mode: EK stack or use [elastic cloud](https://cloud.elastic.co), check [here](https://github.com/elastic/beats/blob/8.10/metricbeat/module/kubernetes/_meta/test/docs/README.md) for details + - for elastic agent in standalone mode: EK stack or use [elastic cloud](https://cloud.elastic.co), check [here](https://github.com/elastic/beats/blob/main/metricbeat/module/kubernetes/_meta/test/docs/README.md) for details - for managed mode: use [elastic cloud](https://cloud.elastic.co) or bring up the stack on docker and then connect docker network with kubernetes kind nodes: ``` elastic-package stack up -d -v diff --git a/deploy/kubernetes/Makefile b/deploy/kubernetes/Makefile index c700550b952..c783f4e2978 100644 --- a/deploy/kubernetes/Makefile +++ b/deploy/kubernetes/Makefile @@ -1,7 +1,7 @@ ALL=elastic-agent-standalone elastic-agent-managed BEAT_VERSION=$(shell grep '^:stack-version:' ../../version/docs/version.asciidoc | cut -c 17- ) -BRANCH_VERSION=$(shell grep '^:stack-version:' ../../version/docs/version.asciidoc | cut -c 17- ) +BRANCH_VERSION=$(shell grep '^:doc-branch:' ../../version/docs/version.asciidoc | cut -c 14- ) #variables needed for ci-create-kubernetes-templates-pull-request ELASTIC_AGENT_REPO=kibana @@ -117,4 +117,4 @@ $(ALL): else echo "No KSM templates generated. Please run: KUSTOMIZE=tue make ci-create-kustomize " -endif +endif \ No newline at end of file diff --git a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml index b839c41814f..2607f4a49c7 100644 --- a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml @@ -30,7 +30,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: elastic-agent - image: docker.elastic.co/beats/elastic-agent:8.10.0 + image: docker.elastic.co/beats/elastic-agent:8.8.1 env: # Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode - name: FLEET_ENROLL diff --git a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml index d0ddeb4f339..4872f0e3e55 100644 --- a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml @@ -683,13 +683,13 @@ spec: # - -c # - >- # mkdir -p /etc/elastic-agent/inputs.d && - # wget -O - https://github.com/elastic/elastic-agent/archive/8.10.0.tar.gz | tar xz -C /etc/elastic-agent/inputs.d --strip=5 "elastic-agent-8.10.0/deploy/kubernetes/elastic-agent-standalone/templates.d" + # wget -O - https://github.com/elastic/elastic-agent/archive/main.tar.gz | tar xz -C /etc/elastic-agent/inputs.d --strip=5 "elastic-agent-main/deploy/kubernetes/elastic-agent-standalone/templates.d" # volumeMounts: # - name: external-inputs # mountPath: /etc/elastic-agent/inputs.d containers: - name: elastic-agent-standalone - image: docker.elastic.co/beats/elastic-agent:8.10.0 + image: docker.elastic.co/beats/elastic-agent:8.8.1 args: ["-c", "/etc/elastic-agent/agent.yml", "-e"] env: # The basic authentication username used to connect to Elasticsearch