Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/prometheus/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "1.24.0"
changes:
- description: Add username, password, and SSL related fields for query dataset.
type: enhancement
link: https://github.com/elastic/integrations/pull/13969
- version: "1.23.1"
changes:
- description: Added description to ssl nodes in datastream manifest.yml files to including links to documentation.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,30 @@ hosts:
- {{this}}
{{/each}}
period: {{period}}
{{#if bearer_token_file}}
bearer_token_file: {{bearer_token_file}}
ssl.verification_mode: {{ssl.verification_mode}}
{{/if}}
{{#if ssl.certificate_authorities}}
ssl.certificate_authorities:
{{#each ssl.certificate_authorities}}
- {{this}}
{{/each}}
{{/if}}
{{#if ssl.certificate}}
ssl.certificate: {{ssl.certificate}}
{{/if}}
{{#if ssl.key}}
ssl.key: {{ssl.key}}
{{/if}}
{{#if ssl.key_passphrase}}
ssl.key_passphrase: {{ssl.key_passphrase}}
{{/if}}
{{#if ssl.ca_trusted_fingerprint}}
ssl.ca_trusted_fingerprint: {{ssl.ca_trusted_fingerprint}}
{{/if}}
username: {{username}}
password: {{password}}
queries: {{queries}}
{{#if leaderelection}}
condition: ${kubernetes_leaderelection.leader} == true
Expand Down
59 changes: 59 additions & 0 deletions packages/prometheus/data_stream/query/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,65 @@ streams:
required: true
show_user: true
default: 10s
- name: bearer_token_file
type: text
title: 'HTTP config options: bearer_token_file'
description: If defined, the contents of the file will be read once at initialization and then the value will be used in an HTTP Authorization header.
multi: false
secret: false
required: false
show_user: false
- name: ssl.verification_mode
type: text
title: SSL Verification Mode
description: SSL verification mode. See [documentation](https://www.elastic.co/guide/en/beats/metricbeat/current/configuration-ssl.html#client-verification-mode) for details.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Lets use the corresponding fleet links instead of beats here
https://www.elastic.co/guide/en/fleet/current/elastic-agent-ssl-configuration.html

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Thanks, I added the new links

multi: false
required: false
show_user: false
default: none
- name: ssl.certificate_authorities
type: text
title: SSL Certificate Authorities
description: SSL certificate authorities. See [documentation](https://www.elastic.co/guide/en/beats/metricbeat/current/configuration-ssl.html#client-certificate-authorities) for details.
multi: true
required: false
show_user: true
- name: ssl.certificate
type: text
title: SSL Certificate
description: SSL certificate. See [documentation](https://www.elastic.co/guide/en/beats/metricbeat/current/configuration-ssl.html#client-certificate) for details.
show_user: true
- name: ssl.key
type: text
title: SSL Private Key
description: SSL private key. See [documentation](https://www.elastic.co/guide/en/beats/metricbeat/current/configuration-ssl.html#client-key) for details.
show_user: true
- name: ssl.key_passphrase
type: password
title: SSL Key Passphrase
description: SSL key passphrase. See [documentation](https://www.elastic.co/guide/en/beats/metricbeat/current/configuration-ssl.html#client-key-passphrase) for details.
secret: true
show_user: true
- name: ssl.ca_trusted_fingerprint
type: text
title: SSL CA Trusted Fingerprint
description: SSL CA trusted fingerprint. See [documentation](https://www.elastic.co/guide/en/beats/metricbeat/current/configuration-ssl.html#ca_trusted_fingerprint) for details.
show_user: true
- name: username
type: text
title: 'HTTP config options: Username'
description: The username to use for basic authentication.
multi: false
required: false
show_user: false
- name: password
type: password
secret: true
title: 'HTTP config options: Password'
description: The password to use for basic authentication.
multi: false
required: false
show_user: false
- name: queries
type: yaml
title: Queries
Expand Down
2 changes: 1 addition & 1 deletion packages/prometheus/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
format_version: "3.3.0"
name: prometheus
title: Prometheus
version: 1.23.1
version: 1.24.0
description: Collect metrics from Prometheus servers with Elastic Agent.
type: integration
categories:
Expand Down