Skip to content

Commit e005d0d

Browse files
authored
[prometheus_input] Add missing SSL fields to sync it with the Prometheus package (#14503)
1 parent 850a721 commit e005d0d

File tree

3 files changed

+50
-11
lines changed

3 files changed

+50
-11
lines changed

packages/prometheus_input/agent/input/input.yml.hbs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ metrics_filters.include:
1616
{{#each metrics_filters.include}}
1717
- {{this}}
1818
{{/each}}
19-
{{#if ssl.certificate_authorities}}
20-
ssl.certificate_authorities:
21-
{{#each ssl.certificate_authorities}}
22-
- {{this}}
23-
{{/each}}
19+
{{#if bearer_token_file}}
20+
bearer_token_file: {{bearer_token_file}}
21+
{{/if}}
22+
{{#if ssl}}
23+
ssl: {{ssl}}
2424
{{/if}}
2525
data_stream:
2626
dataset: {{data_stream.dataset}}

packages/prometheus_input/changelog.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# newer versions go on top
2+
- version: "0.9.0"
3+
changes:
4+
- description: Add SSL configuration options.
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/14503
27
- version: "0.8.0"
38
changes:
49
- description: Add support for defining Leader Election and Conditions

packages/prometheus_input/manifest.yml

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
format_version: "3.0.2"
22
name: prometheus_input
33
title: "Prometheus Input"
4-
version: "0.8.0"
4+
version: "0.9.0"
55
description: "Collects metrics from Prometheus exporter."
66
type: input
77
categories:
@@ -70,11 +70,37 @@ policy_templates:
7070
required: false
7171
show_user: false
7272
default: []
73-
- name: ssl.certificate_authorities
74-
type: text
75-
title: SSL Certificate Authorities
76-
description: SSL Certificate Authorities. See [documentation](https://www.elastic.co/guide/en/beats/metricbeat/current/configuration-ssl.html#client-certificate-authorities) for details.
77-
multi: true
73+
- name: ssl
74+
type: yaml
75+
title: SSL Configuration
76+
default: |
77+
# certificate_authorities: |
78+
# -----BEGIN CERTIFICATE-----
79+
# MIID+jCCAuKgAwIBAgIGAJJMzlxLMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYT
80+
# AlVTMQwwCgYDVQQKEwNJQk0xFjAUBgNVBAsTDURlZmF1bHROb2RlMDExFjAUBgNV
81+
# BAsTDURlZmF1bHRDZWxsMDExGTAXBgNVBAsTEFJvb3QgQ2VydGlmaWNhdGUxEjAQ
82+
# BgNVBAMTCWxvY2FsaG9zdDAeFw0yMTEyMTQyMjA3MTZaFw0yMjEyMTQyMjA3MTZa
83+
# MF8xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xFjAUBgNVBAsTDURlZmF1bHRO
84+
# b2RlMDExFjAUBgNVBAsTDURlZmF1bHRDZWxsMDExEjAQBgNVBAMTCWxvY2FsaG9z
85+
# dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMv5HCsJZIpI5zCy+jXV
86+
# z6lmzNc9UcVSEEHn86h6zT6pxuY90TYeAhlZ9hZ+SCKn4OQ4GoDRZhLPTkYDt+wW
87+
# CV3NTIy9uCGUSJ6xjCKoxClJmgSQdg5m4HzwfY4ofoEZ5iZQ0Zmt62jGRWc0zuxj
88+
# hegnM+eO2reBJYu6Ypa9RPJdYJsmn1RNnC74IDY8Y95qn+WZj//UALCpYfX41hko
89+
# i7TWD9GKQO8SBmAxhjCDifOxVBokoxYrNdzESl0LXvnzEadeZTd9BfUtTaBHhx6t
90+
# njqqCPrbTY+3jAbZFd4RiERPnhLVKMytw5ot506BhPrUtpr2lusbN5svNXjuLeea
91+
# MMUCAwEAAaOBoDCBnTATBgNVHSMEDDAKgAhOatpLwvJFqjAdBgNVHSUEFjAUBggr
92+
# BgEFBQcDAQYIKwYBBQUHAwIwVAYDVR0RBE0wS4E+UHJvZmlsZVVVSUQ6QXBwU3J2
93+
# MDEtQkFTRS05MDkzMzJjMC1iNmFiLTQ2OTMtYWI5NC01Mjc1ZDI1MmFmNDiCCWxv
94+
# Y2FsaG9zdDARBgNVHQ4ECgQITzqhA5sO8O4wDQYJKoZIhvcNAQELBQADggEBAKR0
95+
# gY/BM69S6BDyWp5dxcpmZ9FS783FBbdUXjVtTkQno+oYURDrhCdsfTLYtqUlP4J4
96+
# CHoskP+MwJjRIoKhPVQMv14Q4VC2J9coYXnePhFjE+6MaZbTjq9WaekGrpKkMaQA
97+
# iQt5b67jo7y63CZKIo9yBvs7sxODQzDn3wZwyux2vPegXSaTHR/rop/s/mPk3YTS
98+
# hQprs/IVtPoWU4/TsDN3gIlrAYGbcs29CAt5q9MfzkMmKsuDkTZD0ry42VjxjAmk
99+
# xw23l/k8RoD1wRWaDVbgpjwSzt+kl+vJE/ip2w3h69eEZ9wbo6scRO5lCO2JM4Pr
100+
# 7RhLQyWn2u00L7/9Omw=
101+
# -----END CERTIFICATE-----
102+
description: i.e. certificate_authorities, supported_protocols, verification_mode, key, passphrase etc.
103+
multi: false
78104
required: false
79105
show_user: false
80106
- name: username
@@ -113,6 +139,14 @@ policy_templates:
113139
multi: false
114140
required: false
115141
show_user: true
142+
- name: bearer_token_file
143+
type: text
144+
title: 'HTTP config options: bearer_token_file'
145+
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.
146+
multi: false
147+
secret: false
148+
required: false
149+
show_user: false
116150
- name: processors
117151
type: yaml
118152
title: Processors

0 commit comments

Comments
 (0)