Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run EA container + managed by fleet + standalone + autodiscovery #2366

Merged
merged 18 commits into from
Nov 21, 2022
Merged

Run EA container + managed by fleet + standalone + autodiscovery #2366

merged 18 commits into from
Nov 21, 2022

Conversation

constanca-m
Copy link
Contributor

The main changes of this PR are:

  • The elastic agent container
  • Elastic agent managed by fleet
  • Elastic agent standalone + autodiscovery

I tried to keep the common things like kube-state-metrics, deploy manifests etc in common docs files so it is easier to change them all at once if something changes in the future. I didn't change the common things in the new docs of managed by fleet.

@constanca-m constanca-m requested review from dedemorton and a team as code owners November 15, 2022 15:14
@github-actions
Copy link
Contributor

A documentation preview will be available soon:

@mergify
Copy link
Contributor

mergify bot commented Nov 15, 2022

This pull request does not have a backport label. Could you fix it @constanca-m? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-/d./d is the label to automatically backport to the /d./d branch. /d is the digit
    NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Nov 15, 2022
@constanca-m constanca-m self-assigned this Nov 15, 2022
@constanca-m constanca-m added Team:Cloudnative-Monitoring Label for the Cloud Native Monitoring team docs Improvements or additions to documentation labels Nov 15, 2022
@mergify
Copy link
Contributor

mergify bot commented Nov 15, 2022

This pull request is now in conflict. Could you fix it @constanca-m? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b update-docs upstream/update-docs
git merge upstream/main
git push upstream update-docs

constanca-m and others added 2 commits November 16, 2022 10:17
…overy/kubernetes-conditions-autodiscover.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>
…overy/elastic-agent-kubernetes-autodiscovery.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>
constanca-m and others added 2 commits November 16, 2022 10:37
…overy/kubernetes-conditions-autodiscover.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>
…overy/kubernetes-conditions-autodiscover.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>
constanca-m and others added 2 commits November 16, 2022 11:05
…overy/kubernetes-hints-autodiscover.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>
…eploy-kube-state-metrics.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>
…managed-by-fleet.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>
…managed-by-fleet.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>
constanca-m and others added 2 commits November 18, 2022 16:15
…managed-by-fleet.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>
…managed-by-fleet.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>
condition: ${kubernetes.labels.component} == 'kube-scheduler'
----

WARNING: In some "As a Service" Kubernetes implementations, like GKE, the control plane nodes or even the Pods running on them won’t be visible. In these cases, it won’t be possible to use scheduler metricsets, necessary for this example. Refer https://www.elastic.co/guide/en/beats/metricbeat/current/metricbeat-module-kubernetes.html#_scheduler_and_controllermanager[scheduler and controller manager] to find more information.
Copy link
Contributor

@tetianakravchenko tetianakravchenko Nov 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In these cases, it won’t be possible to use scheduler metricsets, necessary for this example.

is scheduler is really necessary for this example? I mean in context of condition autodiscover?

It is quite confusing to have scheduler sample in between of redis examples.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is important because readers get an idea how to set the host dynamically, and if we don't include it they may not get there on their own. I can only speak for myself, but as someone with little experience with Kubernetes, it would took me awhile to get there.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but we have the similar configuration for the redis:

hosts:
        - '${kubernetes.pod.ip}:6379'

and with redis example can be achieved the same, no? (if there will be deployed multiple redis pods)

what I meant: it is confusing to get scheduler example, it doesn't seem to be relevant to what was said before - redis, and after - redis. Maybe it should be in separate block, not in == Example: Target Pods by label

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At first it was indeed a separate block. But after discussion, it changed

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still don't understand why example with scheduler is needed here, and what value does it bring if there exists already example with ${kubernetes.pod.ip}.

As you already have enough reviews - you can merge this PR

constanca-m and others added 2 commits November 21, 2022 08:58
…overy/kubernetes-hints-autodiscover.asciidoc

Co-authored-by: Tetiana Kravchenko <tanya.kravchenko.v@gmail.com>
@constanca-m constanca-m merged commit 4b8f02b into elastic:main Nov 21, 2022
@constanca-m constanca-m deleted the update-docs branch November 21, 2022 15:33
@constanca-m constanca-m restored the update-docs branch November 22, 2022 15:59
@dedemorton
Copy link
Contributor

@constanca-m Will you be backporting this PR to 8.6? I tried to backport a change here, but noticed that your changes were not in 8.6. Let me know if you do decide to backport your PR so that I can make sure #2410 gets backported too. Thanks!

@constanca-m constanca-m added backport-8.6 Automated backport with mergify and removed backport-skip Skip notification from the automated backport with mergify labels Nov 29, 2022
mergify bot pushed a commit that referenced this pull request Nov 29, 2022
* Run EA container + managed by fleet + standalone + autodiscovery

* Update docs/en/ingest-management/elastic-agent/configuration/autodiscovery/kubernetes-conditions-autodiscover.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/configuration/autodiscovery/elastic-agent-kubernetes-autodiscovery.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/configuration/autodiscovery/kubernetes-conditions-autodiscover.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/configuration/autodiscovery/kubernetes-conditions-autodiscover.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/configuration/autodiscovery/kubernetes-hints-autodiscover.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/run-container-common/deploy-kube-state-metrics.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Apply suggestions.

* Corrected Pod to pod on yaml

* Changed provider link on autodiscover.

* Update docs/en/ingest-management/elastic-agent/running-on-kubernetes-managed-by-fleet.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/running-on-kubernetes-managed-by-fleet.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/running-on-kubernetes-managed-by-fleet.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/running-on-kubernetes-managed-by-fleet.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/configuration/autodiscovery/kubernetes-hints-autodiscover.asciidoc

Co-authored-by: Tetiana Kravchenko <tanya.kravchenko.v@gmail.com>

* Some corrections.

* Removed unnecessary annotations.

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>
Co-authored-by: Tetiana Kravchenko <tanya.kravchenko.v@gmail.com>
(cherry picked from commit 4b8f02b)
@gsantoro gsantoro mentioned this pull request Nov 29, 2022
constanca-m added a commit that referenced this pull request Nov 29, 2022
…) (#2419)

* Run EA container + managed by fleet + standalone + autodiscovery

* Update docs/en/ingest-management/elastic-agent/configuration/autodiscovery/kubernetes-conditions-autodiscover.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/configuration/autodiscovery/elastic-agent-kubernetes-autodiscovery.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/configuration/autodiscovery/kubernetes-conditions-autodiscover.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/configuration/autodiscovery/kubernetes-conditions-autodiscover.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/configuration/autodiscovery/kubernetes-hints-autodiscover.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/run-container-common/deploy-kube-state-metrics.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Apply suggestions.

* Corrected Pod to pod on yaml

* Changed provider link on autodiscover.

* Update docs/en/ingest-management/elastic-agent/running-on-kubernetes-managed-by-fleet.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/running-on-kubernetes-managed-by-fleet.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/running-on-kubernetes-managed-by-fleet.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/running-on-kubernetes-managed-by-fleet.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/configuration/autodiscovery/kubernetes-hints-autodiscover.asciidoc

Co-authored-by: Tetiana Kravchenko <tanya.kravchenko.v@gmail.com>

* Some corrections.

* Removed unnecessary annotations.

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>
Co-authored-by: Tetiana Kravchenko <tanya.kravchenko.v@gmail.com>
(cherry picked from commit 4b8f02b)

Co-authored-by: Constança Manteigas <113898685+constanca-m@users.noreply.github.com>
bmorelli25 pushed a commit to bmorelli25/observability-docs that referenced this pull request Apr 11, 2023
…stic#2366)

* Run EA container + managed by fleet + standalone + autodiscovery

* Update docs/en/ingest-management/elastic-agent/configuration/autodiscovery/kubernetes-conditions-autodiscover.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/configuration/autodiscovery/elastic-agent-kubernetes-autodiscovery.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/configuration/autodiscovery/kubernetes-conditions-autodiscover.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/configuration/autodiscovery/kubernetes-conditions-autodiscover.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/configuration/autodiscovery/kubernetes-hints-autodiscover.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/run-container-common/deploy-kube-state-metrics.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Apply suggestions.

* Corrected Pod to pod on yaml

* Changed provider link on autodiscover.

* Update docs/en/ingest-management/elastic-agent/running-on-kubernetes-managed-by-fleet.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/running-on-kubernetes-managed-by-fleet.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/running-on-kubernetes-managed-by-fleet.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/running-on-kubernetes-managed-by-fleet.asciidoc

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>

* Update docs/en/ingest-management/elastic-agent/configuration/autodiscovery/kubernetes-hints-autodiscover.asciidoc

Co-authored-by: Tetiana Kravchenko <tanya.kravchenko.v@gmail.com>

* Some corrections.

* Removed unnecessary annotations.

Co-authored-by: Andrew Gizas <andreas.gkizas@elastic.co>
Co-authored-by: Tetiana Kravchenko <tanya.kravchenko.v@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.6 Automated backport with mergify docs Improvements or additions to documentation Team:Cloudnative-Monitoring Label for the Cloud Native Monitoring team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants