From e4b70cd932c2b0cdfeabe3a5824c2bd13acfa736 Mon Sep 17 00:00:00 2001 From: PromOperatorBot <85787986+prom-op-bot@users.noreply.github.com> Date: Mon, 4 Sep 2023 10:35:33 +0200 Subject: [PATCH] [bot] [main] Automated version update (#2211) Co-authored-by: Prometheus Operator Bot <prom-op-bot@users.noreply.github.com> --- jsonnetfile.lock.json | 20 ++++++------- ...0scrapeconfigCustomResourceDefinition.yaml | 30 +++++++++++++++++++ 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index ce933327..3d5c1c50 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "2888a95d5d4f20e7e852214e888d79ead642300b", + "version": "e80c8966f1153c5b6221fe3ae07335066b6c108e", "sum": "GdePvMDfLQcVhwzk/Ephi/jC27ywGObLB5t0eC0lXd4=" }, { @@ -78,7 +78,7 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "dbd456831b5adfc8642d5c7793c6cdad59c2e975", + "version": "84abaf71386f0c52c913e6da9002915a09018dce", "sum": "+dOzAK+fwsFf97uZpjcjTcEJEC1H8hh/j8f5uIQK/5g=" }, { @@ -88,7 +88,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "dbd456831b5adfc8642d5c7793c6cdad59c2e975", + "version": "84abaf71386f0c52c913e6da9002915a09018dce", "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c=" }, { @@ -98,7 +98,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "0209080d37fc4293cfa6be252dcfec926fdfc39a", + "version": "eae06bc25466bf44c4026700b8fbe5ca1af69328", "sum": "n3flMIzlADeyygb0uipZ4KPp2uNSjdtkrwgHjTC7Ca4=", "name": "prometheus-operator-mixin" }, @@ -109,8 +109,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "0209080d37fc4293cfa6be252dcfec926fdfc39a", - "sum": "Gr+fwRoLDcx3fVegJJRQzFCWUugbFQXO/l1Pz2TNYzI=" + "version": "eae06bc25466bf44c4026700b8fbe5ca1af69328", + "sum": "YAOAlG8dXDtg2nT6hnIN4U6yapwNHwCXPJbDMHX00YY=" }, { "source": { @@ -119,7 +119,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "6cbe2eb21f7cd770d8f247c545941f3a8c97f6a0", + "version": "2a83643cdfea789c1ae30751684102b0fa5dad37", "sum": "1d7ZKYArJKacAWXLUz0bRC1uOkozee/PPw97/W5zGhc=", "name": "alertmanager" }, @@ -140,7 +140,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "c5e1498ae243bbf0b8363786de065bf98acd1edb", + "version": "b6f903b5f92b5458ad2244d9f442f7f859c01eb3", "sum": "8OngT76gVXOUROOOeP9yTe6E/dn+2D2J34Dn690QCG0=", "name": "prometheus" }, @@ -151,7 +151,7 @@ "subdir": "config/crd/bases" } }, - "version": "b81fbf22bec162581c78b449f9a95f63d9d4d527", + "version": "f2584910973e165509f260fe6943706185d11e5e", "sum": "v0uv2DLx8qjW+OviUfzTFOzZ+0IizXqBhuglGHIhGmo=" }, { @@ -161,7 +161,7 @@ "subdir": "mixin" } }, - "version": "7b20b1db38857ee69abe6cb1e7e3c67ef4b96fe8", + "version": "78f21b9f407b70f0728214a3e5573d532c427347", "sum": "WhheqsiX0maUXByZFsb9xhCEsGXK2955bPmPPf1x+Cs=", "name": "thanos-mixin" }, diff --git a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml index ff049bea..471a18e3 100644 --- a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml +++ b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml @@ -429,6 +429,36 @@ spec: - server type: object type: array + dnsSDConfigs: + description: DNSSDConfigs defines a list of DNS service discovery configurations. + items: + description: DNSSDConfig allows specifying a set of DNS domain names which are periodically queried to discover a list of targets. The DNS servers to be contacted are read from /etc/resolv.conf. See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#dns_sd_config + properties: + names: + description: A list of DNS domain names to be queried. + items: + type: string + minItems: 1 + type: array + port: + description: The port number used if the query type is not SRV Ignored for SRV records + type: integer + refreshInterval: + description: RefreshInterval configures the time after which the provided names are refreshed. If not set, Prometheus uses its default value. + pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$ + type: string + type: + description: The type of DNS query to perform. One of SRV, A, AAAA or MX. If not set, Prometheus uses its default value. + enum: + - SRV + - A + - AAAA + - MX + type: string + required: + - names + type: object + type: array fileSDConfigs: description: FileSDConfigs defines a list of file service discovery configurations. items: -- GitLab