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

Clarify support for ssl options for modules #7967

Merged
merged 2 commits into from
Sep 24, 2018

Conversation

dedemorton
Copy link
Contributor

This PR fills in some missing documentation to resolve #3948.

I used the example from the original PR without testing it (avoids eye contact), but maybe another example--perhaps from the reference.yml file--would be better. Please advise.

With these other commits/PRs, I think we can close #3948, right?

@dedemorton dedemorton added docs review needs_backport PR is waiting to be backported to other branches. labels Aug 14, 2018
@dedemorton dedemorton requested a review from ruflin August 14, 2018 22:08

[source,yaml]
----
- module: prometheus
Copy link
Contributor

Choose a reason for hiding this comment

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

We could use just the http module here to reduce the noise around it but mention it works for all http based modules.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ruflin That makes sense. I looked at the docs for the http module, but it looks like we haven't updated the config to show the ssl options: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-http.html

Can you provide an example config? I can also update the config.yml if you let me know what I need to add and where.

I guess I should also go through the other modules that have settings: ["ssl"] to make sure that the config examples are updated?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

(After a quick spot check, I can see that there are several modules with the ssl flag that need to have their config examples updated).

Copy link
Contributor

Choose a reason for hiding this comment

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

@jsoriano Could you chime in here? I remember you were updating recently quite a few things related to SSL.

Copy link
Member

Choose a reason for hiding this comment

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

Oh yes, the thing is that we may need two different ssl documentation templates, one for HTTPS and another one for plain TLS, when adding the mongodb TLS support, the template added something about HTTP (I should have reviewed this 🙁 )

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jsoriano I'm not quite sure how to proceed here. Please advise. Thanks!

Copy link
Member

Choose a reason for hiding this comment

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

I think there should be two different templates, one for HTTP services and another one for TLS. Services that support HTTPS would use both, services that use TLS over TCP without HTTP would use the TLS one only.

In any case maybe I'm mixing things, I'm refering to the text that is added to modules documentation when they have settings: ["ssl"] in fields.yml, let's merge this and I'll open another PR with a proposal for the other thing.

Copy link
Member

@jsoriano jsoriano Aug 30, 2018

Choose a reason for hiding this comment

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

PR for the issue with TLS/HTTP doc text in metricbeat modules #8159

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We talked about updating the example config, too. I should do this before we merge. Can someone provide an example?

Copy link
Member

Choose a reason for hiding this comment

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

I think @ruflin refered to something like this as a generic example here:

- module: http
  namespace: "myservice"
  enabled: true
  period: 10s
  hosts: ["https://localhost"]
  path: "/stats"
  headers:
    Authorization: "Bearer test123"
  ssl.verification_mode: "none"

Not sure though if it'd be better to have a generic example or a real world example as the one with prometheus and the k8s apiserver.

@dedemorton
Copy link
Contributor Author

@jsoriano I changed the example to show the http module config. I think this is ready to merge, no?

@dedemorton dedemorton merged commit c0ec744 into elastic:master Sep 24, 2018
@dedemorton dedemorton deleted the issue#3948 branch October 1, 2018 22:03
@dedemorton dedemorton removed the needs_backport PR is waiting to be backported to other branches. label Oct 1, 2018
dedemorton added a commit to dedemorton/beats that referenced this pull request Oct 17, 2018
* Clarify support for ssl options for modules

* Change example to show http module
dedemorton added a commit that referenced this pull request Oct 18, 2018
…8478) (#8529)

* Clarify support for ssl options for modules (#7967)

* Clarify support for ssl options for modules

* Change example to show http module

* Update Elasticsearch module examples to show http in the URL (#8226)

* Improve reference docs that describe how to set options dynamically (#8290)

* Improve Elasticsearch output docs about indices, pipelines, and keys settings

* Updates from review

* Change setting name from mapping to mappings

* Remove note to reviewer

* Fix conditional coding (#8446)

* Suppress dashboard info when dashboards aren't available (#8395)

* Clarify add_docker_metadata docs (#8478)
dedemorton added a commit to dedemorton/beats that referenced this pull request Oct 18, 2018
* Clarify support for ssl options for modules

* Change example to show http module
dedemorton added a commit that referenced this pull request Oct 19, 2018
…8478) (#8528)

* Clarify support for ssl options for modules (#7967)

* Clarify support for ssl options for modules

* Change example to show http module

* Update Elasticsearch module examples to show http in the URL (#8226)

* Improve reference docs that describe how to set options dynamically (#8290)

* Improve Elasticsearch output docs about indices, pipelines, and keys settings

* Updates from review

* Change setting name from mapping to mappings

* Remove note to reviewer

* Fix conditional coding (#8446)

* Suppress dashboard info when dashboards aren't available (#8395)

* Clarify add_docker_metadata docs (#8478)
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
…tic#8290 elastic#8395 elastic#8446 elastic#8478) (elastic#8528)

* Clarify support for ssl options for modules (elastic#7967)

* Clarify support for ssl options for modules

* Change example to show http module

* Update Elasticsearch module examples to show http in the URL (elastic#8226)

* Improve reference docs that describe how to set options dynamically (elastic#8290)

* Improve Elasticsearch output docs about indices, pipelines, and keys settings

* Updates from review

* Change setting name from mapping to mappings

* Remove note to reviewer

* Fix conditional coding (elastic#8446)

* Suppress dashboard info when dashboards aren't available (elastic#8395)

* Clarify add_docker_metadata docs (elastic#8478)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Document headers and ssl for metricsets
3 participants