diff --git a/packages/prometheus/changelog.yml b/packages/prometheus/changelog.yml index aac7e327fae..828246df8cb 100644 --- a/packages/prometheus/changelog.yml +++ b/packages/prometheus/changelog.yml @@ -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. diff --git a/packages/prometheus/data_stream/query/agent/stream/stream.yml.hbs b/packages/prometheus/data_stream/query/agent/stream/stream.yml.hbs index cf1bbd27d82..c93ca4c2ddf 100644 --- a/packages/prometheus/data_stream/query/agent/stream/stream.yml.hbs +++ b/packages/prometheus/data_stream/query/agent/stream/stream.yml.hbs @@ -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 diff --git a/packages/prometheus/data_stream/query/manifest.yml b/packages/prometheus/data_stream/query/manifest.yml index 06c4230ed7e..1e3e1fb3aeb 100644 --- a/packages/prometheus/data_stream/query/manifest.yml +++ b/packages/prometheus/data_stream/query/manifest.yml @@ -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/docs/reference/fleet/elastic-agent-ssl-configuration#ssl.verification_mode-client-setting) for details. + 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/docs/reference/fleet/elastic-agent-ssl-configuration#ssl.certificate_authorities-client-setting) 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/docs/reference/fleet/elastic-agent-ssl-configuration#ssl.certificate-client-setting) for details. + show_user: true + - name: ssl.key + type: text + title: SSL Private Key + description: SSL private key. See [documentation](https://www.elastic.co/docs/reference/fleet/elastic-agent-ssl-configuration#ssl.key-client-setting) 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/docs/reference/fleet/elastic-agent-ssl-configuration#ssl.key_passphrase-client-setting) 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/docs/reference/fleet/elastic-agent-ssl-configuration#ssl.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 diff --git a/packages/prometheus/manifest.yml b/packages/prometheus/manifest.yml index 21c5de0ac5c..d5379f1c869 100644 --- a/packages/prometheus/manifest.yml +++ b/packages/prometheus/manifest.yml @@ -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: