etcd: Added ssl options by alstolten · Pull Request #9414 · elastic/integrations

alstolten · 2024-03-21T18:03:08Z

Proposed commit message

Add ssl options to the etcd integration.

Checklist

I have reviewed tips for building integrations and this pull request is aligned with them.
I have verified that all data streams collect metrics or logs.
I have added an entry to my package's changelog.yml file.
I have verified that Kibana version constraints are current according to guidelines.

Author's Checklist

some of the formatting changes seemed to have been introduced by elastic-package build, they were not made by me

How to test this PR locally

This is a little tricky to test. I tested locally with the minikube etcd server and the elastic-package stack. The agent deployed with the elastic-package stack needs to be added to the minikube docker network (docker network connect minikube elastic-package-stack-elastic-agent-1)
the certs to the minikube etcd are in /var/lib/docker/volumes/minikube/_data/lib/minikube/certs/etcd by default
I tested v3 metrics
data was successfully ingested and the shipped Dashboard did contain data
agent policy did contain the correct configuration
integration configuration UI showed the field

Related issues

This is very related to:

[Stack Monitoring] Add missing metricbeat configuration to integrations #4666
I followed the pattern used in:
[Kibana] Added ssl config support to kibana module #4912
closes [ETCD] Enable configuration of CA for https connection to etcd host #9408

Screenshots

alstolten · 2024-03-21T18:10:05Z

Now also based on the right version...

packages/etcd/changelog.yml

Co-authored-by: Aliabbas Attarwala <124054599+aliabbas-elastic@users.noreply.github.com>

ali786XI

LGTM for rest changes

alstolten · 2024-04-02T15:17:26Z

Hi @aliabbas-elastic, could you let me know how I can re-trigger the build?

ali786XI · 2024-04-02T15:22:38Z

/test

elasticmachine · 2024-04-22T09:34:56Z

💚 Build Succeeded

Buildkite Build
Commit: 754da9a

History

💚 Build #10021 succeeded 9e7fa51
💔 Build #9900 failed 9e7fa51
💚 Build #9755 succeeded e221443
💔 Build #9753 failed 1d02243

elastic-sonarqube · 2024-04-22T09:35:00Z

Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

ishleenk17

In general, this PR has many files with irrelevant changes.
Maybe, related to formatting. Please revert those.

ishleenk17 · 2024-04-25T04:58:17Z

packages/etcd/data_stream/leader/fields/fields.yml

+      type: group
+      description: >
+        Contains follower statistics.
+


This diff is irrelevant

The changes are from the elastic-package format command, do you think we should revert them?

Should be good then.

ishleenk17 · 2024-04-25T04:58:32Z

packages/etcd/data_stream/leader/manifest.yml

    title: etcd leader metrics
    description: Collect etcd leader metrics
-    enabled: false
+    enabled: false


Same here, irrelevant diff

ishleenk17 · 2024-04-25T04:59:46Z

packages/etcd/manifest.yml

+  - name: ssl
+    type: yaml
+    title: SSL Configuration
+    description: i.e. certificate, certificate_authorities, verification_mode etc. See [SSL](https://www.elastic.co/guide/en/beats/metricbeat/current/configuration-ssl.html#ssl-client-config) for details.


Lets use link to the Agent instead of beats here

You mean this one: https://www.elastic.co/guide/en/fleet/current/elastic-agent-ssl-configuration.html#client-ssl-options?

Alphayeeeet · 2024-05-17T12:03:56Z

Is there also the possibility to specify file system paths instead of certificate content inline? WIth this option, you could use the respective Cert and Key files available on Kubernetes Master Nodes.

gpop63 · 2024-05-17T14:21:11Z

Is there also the possibility to specify file system paths instead of certificate content inline? WIth this option, you could use the respective Cert and Key files available on Kubernetes Master Nodes.

@Alphayeeeet yes, you can specify path to certs or certs content.

ishleenk17

Looks good!

elasticmachine · 2024-05-28T11:51:28Z

Package etcd - 1.1.0 containing this change is available at https://epr.elastic.co/search?package=etcd

etcd: Added ssl options

1d02243

alstolten added the enhancement New feature or request label Mar 21, 2024

alstolten requested a review from a team as a code owner March 21, 2024 18:03

Merge branch 'main' into etcd-ssl-configuration

e221443

alstolten added the Integration:etcd etcd label Mar 21, 2024

ali786XI suggested changes Mar 26, 2024

View reviewed changes

packages/etcd/changelog.yml Outdated Show resolved Hide resolved

packages/etcd/changelog.yml Outdated Show resolved Hide resolved

lalit-satapathy requested a review from gpop63 March 26, 2024 09:47

alstolten and others added 2 commits March 27, 2024 09:06

Update packages/etcd/changelog.yml

4ebd485

Co-authored-by: Aliabbas Attarwala <124054599+aliabbas-elastic@users.noreply.github.com>

Update packages/etcd/changelog.yml

9e7fa51

Co-authored-by: Aliabbas Attarwala <124054599+aliabbas-elastic@users.noreply.github.com>

ali786XI approved these changes Mar 27, 2024

View reviewed changes

gpop63 approved these changes Apr 7, 2024

View reviewed changes

alstolten enabled auto-merge (squash) April 9, 2024 14:48

Merging upstream

754da9a

ishleenk17 reviewed Apr 25, 2024

View reviewed changes

Alphayeeeet mentioned this pull request May 17, 2024

Add etcd integration for Elastic Agent #8885

Closed

ishleenk17 approved these changes May 28, 2024

View reviewed changes

alstolten merged commit 97f2474 into elastic:main May 28, 2024

Conversation

alstolten commented Mar 21, 2024

Proposed commit message

Checklist

Author's Checklist

How to test this PR locally

Related issues

Screenshots

Uh oh!

alstolten commented Mar 21, 2024

Uh oh!

Uh oh!

Uh oh!

ali786XI left a comment

Choose a reason for hiding this comment

Uh oh!

alstolten commented Apr 2, 2024

Uh oh!

ali786XI commented Apr 2, 2024

Uh oh!

elasticmachine commented Apr 22, 2024

💚 Build Succeeded

History

Uh oh!

elastic-sonarqube bot commented Apr 22, 2024

Quality Gate passed

Uh oh!

ishleenk17 left a comment

Choose a reason for hiding this comment

Uh oh!

ishleenk17 Apr 25, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gpop63 May 4, 2024

Choose a reason for hiding this comment

Uh oh!

ishleenk17 May 28, 2024

Choose a reason for hiding this comment

Uh oh!

ishleenk17 Apr 25, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ishleenk17 Apr 25, 2024

Choose a reason for hiding this comment

Uh oh!

gpop63 May 4, 2024

Choose a reason for hiding this comment

Uh oh!

ishleenk17 May 28, 2024

Choose a reason for hiding this comment

Uh oh!

Alphayeeeet commented May 17, 2024

Uh oh!

gpop63 commented May 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ishleenk17 left a comment

Choose a reason for hiding this comment

Uh oh!

elasticmachine commented May 28, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

ishleenk17 Apr 25, 2024 •

edited

Loading

ishleenk17 Apr 25, 2024 •

edited

Loading

gpop63 commented May 17, 2024 •

edited

Loading