UNCLASSIFIED

Commit 69d03c5e authored by kuisathaverat's avatar kuisathaverat
Browse files

chore: typos and broken links

parent 2267cda5
Pipeline #81030 passed with stages
in 14 minutes and 36 seconds
################################################################################ ################################################################################
# Build stage 0 # Build stage 0
# Extract APM Server and make various file manipulations. # Extract Elastic Agent and make various file manipulations.
################################################################################ ################################################################################
ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_REGISTRY=registry1.dsop.io
ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
...@@ -17,7 +17,6 @@ WORKDIR /usr/share/${ELASTIC_PRODUCT} ...@@ -17,7 +17,6 @@ WORKDIR /usr/share/${ELASTIC_PRODUCT}
COPY --chown=1000:0 ${ELASTIC_PRODUCT}-${ELASTIC_STACK}-${OS_AND_ARCH}.tar.gz . COPY --chown=1000:0 ${ELASTIC_PRODUCT}-${ELASTIC_STACK}-${OS_AND_ARCH}.tar.gz .
RUN tar --strip-components=1 -zxf ${ELASTIC_PRODUCT}-${ELASTIC_STACK}-${OS_AND_ARCH}.tar.gz \ RUN tar --strip-components=1 -zxf ${ELASTIC_PRODUCT}-${ELASTIC_STACK}-${OS_AND_ARCH}.tar.gz \
&& rm ${ELASTIC_PRODUCT}-${ELASTIC_STACK}-${OS_AND_ARCH}.tar.gz && rm ${ELASTIC_PRODUCT}-${ELASTIC_STACK}-${OS_AND_ARCH}.tar.gz
#COPY config/elastic-agent.yml /usr/share/${ELASTIC_PRODUCT}
# Support arbitrary user ids # Support arbitrary user ids
# Ensure that group permissions are the same as user permissions. # Ensure that group permissions are the same as user permissions.
...@@ -86,16 +85,16 @@ RUN chmod 755 /usr/local/bin/docker-entrypoint ...@@ -86,16 +85,16 @@ RUN chmod 755 /usr/local/bin/docker-entrypoint
USER ${ELASTIC_PRODUCT} USER ${ELASTIC_PRODUCT}
ENV ELASTIC_PRODUCT=${ELASTIC_PRODUCT} ENV ELASTIC_PRODUCT=${ELASTIC_PRODUCT}
# TODO update these links when Elastic Agent is in GA
LABEL org.label-schema.schema-version="1.0" \ LABEL org.label-schema.schema-version="1.0" \
org.label-schema.vendor="Elastic" \ org.label-schema.vendor="Elastic" \
org.label-schema.name="${ELASTIC_PRODUCT}" \ org.label-schema.name="${ELASTIC_PRODUCT}" \
org.label-schema.version="${ELASTIC_STACK}" \ org.label-schema.version="${ELASTIC_STACK}" \
org.label-schema.url="https://www.elastic.co/products/${ELASTIC_PRODUCT}" \ org.label-schema.url="https://www.elastic.co/guide/en/ingest-management/current/index.html" \
org.label-schema.vcs-url="https://github.com/elastic/${ELASTIC_PRODUCT}" \ org.label-schema.vcs-url="https://github.com/elastic/${ELASTIC_PRODUCT}" \
org.label-schema.license="Elastic License" license="Elastic License" org.label-schema.license="Elastic License" license="Elastic License"
ENTRYPOINT ["/usr/local/bin/dumb-init", "--", "/usr/local/bin/docker-entrypoint"] ENTRYPOINT ["/usr/local/bin/dumb-init", "--", "/usr/local/bin/docker-entrypoint"]
CMD ["--environment", "container"] CMD ["--environment", "container"]
# see https://www.elastic.co/guide/en/beats/elastic-agent/current/http-endpoint.html
HEALTHCHECK --interval=10s --timeout=5s --start-period=1m --retries=5 CMD test -w '/tmp/elastic-agent/default/metricbeat/metricbeat.sock' HEALTHCHECK --interval=10s --timeout=5s --start-period=1m --retries=5 CMD test -w '/tmp/elastic-agent/default/metricbeat/metricbeat.sock'
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
**elastic-agent** is a single, unified way to add monitoring for logs, metrics, and other types of data to each host. A single agent makes it easier and faster to deploy monitoring across your infrastructure. The agent’s single, unified configuration makes it easier to add integrations for new data sources. **elastic-agent** is a single, unified way to add monitoring for logs, metrics, and other types of data to each host. A single agent makes it easier and faster to deploy monitoring across your infrastructure. The agent’s single, unified configuration makes it easier to add integrations for new data sources.
For more information about elastic-agent, please visit For more information about elastic-agent, please visit
https://www.elastic.co/guide/en/ingest-management/7.9/index.html. https://www.elastic.co/guide/en/ingest-management/7.10/index.html.
--- ---
**NOTE** **NOTE**
...@@ -14,7 +14,7 @@ This functionality is in beta and is subject to change. The design and code is l ...@@ -14,7 +14,7 @@ This functionality is in beta and is subject to change. The design and code is l
### Installation instructions ### Installation instructions
Please follow the documentation on [Quick start](https://www.elastic.co/guide/en/ingest-management/7.9/ingest-management-getting-started.html). Please follow the documentation on [Quick start](https://www.elastic.co/guide/en/ingest-management/7.10/ingest-management-getting-started.html).
### Where to file issues and PRs ### Where to file issues and PRs
...@@ -37,7 +37,7 @@ visiting [Elastic Community](https://www.elastic.co/community). ...@@ -37,7 +37,7 @@ visiting [Elastic Community](https://www.elastic.co/community).
This software is governed by the [Elastic This software is governed by the [Elastic
License](https://github.com/elastic/elasticsearch/blob/7.9/licenses/ELASTIC-LICENSE.txt), License](https://github.com/elastic/elasticsearch/blob/7.10/licenses/ELASTIC-LICENSE.txt),
and includes the full set of [free and includes the full set of [free
features](https://www.elastic.co/subscriptions). features](https://www.elastic.co/subscriptions).
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment