From e99a3276a58a1e71802342796576181ed9674435 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 06:51:28 +0100 Subject: [PATCH] chore(deps): bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring from 0.78.2 to 0.79.2 in /kubernetes-model-generator/openapi/generator (6745) chore(deps): bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring Bumps [github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring](https://github.com/prometheus-operator/prometheus-operator) from 0.78.2 to 0.79.2. - [Release notes](https://github.com/prometheus-operator/prometheus-operator/releases) - [Changelog](https://github.com/prometheus-operator/prometheus-operator/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus-operator/prometheus-operator/compare/v0.78.2...v0.79.2) --- updated-dependencies: - dependency-name: github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- feat(openapi): regenerate model for github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring 0.79.2 Signed-off-by: Marc Nuri Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marc Nuri --- .../openapi/generator/go.mod | 13 +- .../openapi/generator/go.sum | 26 ++- .../openapi/schemas/openshift-generated.json | 191 +++++++++++++++--- .../monitoring/v1/AlertmanagerEndpoints.java | 61 +++++- .../model/monitoring/v1/AlertmanagerSpec.java | 17 +- .../monitoring/v1/CommonPrometheusFields.java | 44 +++- .../api/model/monitoring/v1/OTLPConfig.java | 18 +- .../monitoring/v1/PodMetricsEndpoint.java | 16 +- .../model/monitoring/v1/PodMonitorSpec.java | 30 ++- .../api/model/monitoring/v1/ProbeSpec.java | 16 +- .../model/monitoring/v1/PrometheusSpec.java | 30 ++- .../api/model/monitoring/v1/RuleGroup.java | 18 +- .../api/model/monitoring/v1/ScrapeClass.java | 16 +- .../monitoring/v1/ServiceMonitorSpec.java | 30 ++- .../monitoring/v1alpha1/ConsulSDConfig.java | 30 ++- .../v1alpha1/PrometheusAgentSpec.java | 45 ++++- .../monitoring/v1alpha1/ScrapeConfigSpec.java | 30 ++- .../monitoring/v1alpha1/TelegramConfig.java | 16 +- .../monitoring/v1beta1/TelegramConfig.java | 16 +- 19 files changed, 592 insertions(+), 71 deletions(-) diff --git a/kubernetes-model-generator/openapi/generator/go.mod b/kubernetes-model-generator/openapi/generator/go.mod index 9b79d06556..6f02528224 100644 --- a/kubernetes-model-generator/openapi/generator/go.mod +++ b/kubernetes-model-generator/openapi/generator/go.mod @@ -22,7 +22,7 @@ require ( github.com/operator-framework/api v0.27.1-0.20241002175140-413605f42947 github.com/operator-framework/operator-lifecycle-manager v0.22.0 github.com/ovn-org/ovn-kubernetes/go-controller v0.0.0-20241030140127-a68ef49d9441 - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.2 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.79.2 github.com/spf13/cobra v1.8.1 github.com/stolostron/discovery v0.0.0-20241023180217-47cd9895f600 github.com/stolostron/klusterlet-addon-controller v0.0.0-20240912124113-fe0b6574a401 @@ -127,7 +127,6 @@ require ( github.com/docker/go-units v0.5.0 // indirect github.com/emicklei/go-restful/v3 v3.12.1 // indirect github.com/evanphx/json-patch/v5 v5.9.0 // indirect - github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect github.com/go-errors/errors v1.4.2 // indirect github.com/go-kit/log v0.2.1 // indirect @@ -201,7 +200,7 @@ require ( golang.org/x/crypto v0.31.0 // indirect golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect golang.org/x/mod v0.21.0 // indirect - golang.org/x/net v0.30.0 // indirect + golang.org/x/net v0.32.0 // indirect golang.org/x/oauth2 v0.23.0 // indirect golang.org/x/sync v0.10.0 // indirect golang.org/x/sys v0.28.0 // indirect @@ -220,11 +219,11 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect istio.io/api v1.24.0-rc.0.0.20241101200753-9397ebf09c3a // indirect k8s.io/klog/v2 v2.130.1 // indirect - k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect + k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad // indirect - sigs.k8s.io/controller-runtime v0.19.0 // indirect - sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect + sigs.k8s.io/controller-runtime v0.19.3 // indirect + sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/kubernetes-model-generator/openapi/generator/go.sum b/kubernetes-model-generator/openapi/generator/go.sum index 0c90d7ec1c..b7d92f629b 100644 --- a/kubernetes-model-generator/openapi/generator/go.sum +++ b/kubernetes-model-generator/openapi/generator/go.sum @@ -332,8 +332,6 @@ github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHqu github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= -github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= @@ -962,8 +960,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.2 h1:SyoVBXD/r0PntR1rprb90ClI32FSUNOCWqqTatnipHM= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.2/go.mod h1:SvsRXw4m1F2vk7HquU5h475bFpke27mIUswfyw9u3ug= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.79.2 h1:DGv150w4UyxnjNHlkCw85R3+lspOxegtdnbpP2vKRrk= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.79.2/go.mod h1:AVMP4QEW8xuGWnxaWSpI3kKjP9fDA31nO68zsyREJZA= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= @@ -1433,8 +1431,8 @@ golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= -golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= -golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI= +golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -2028,8 +2026,8 @@ k8s.io/utils v0.0.0-20211208161948-7d6a63dca704/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro= -k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0= +k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= knative.dev/caching v0.0.0-20241022012359-41bbaf964d16 h1:vQ0y0mO1ALdOd/FPiw7gf1415mf41aWnLOVOtTr2/jQ= knative.dev/caching v0.0.0-20241022012359-41bbaf964d16/go.mod h1:qOvjasSUI+GyF4hsqJmIomblcgjkLzJhng8/zk0B9J4= knative.dev/eventing v0.28.0/go.mod h1:zxoB37kQxEkfCvKA7wZuHOPYInz6SFJzrhmG9IAd/iY= @@ -2080,15 +2078,15 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcp sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= sigs.k8s.io/cluster-api v1.8.5 h1:lNA2fPN4fkXEs+oOQlnwxT/4VwRFBpv5kkSoJG8nqBA= sigs.k8s.io/cluster-api v1.8.5/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY= -sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q= -sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= +sigs.k8s.io/controller-runtime v0.19.3 h1:XO2GvC9OPftRst6xWCpTgBZO04S2cbp0Qqkj8bX1sPw= +sigs.k8s.io/controller-runtime v0.19.3/go.mod h1:j4j87DqtsThvwTv5/Tc5NFRyyF/RF0ip4+62tbTSIUM= sigs.k8s.io/gateway-api v1.2.1 h1:fZZ/+RyRb+Y5tGkwxFKuYuSRQHu9dZtbjenblleOLHM= sigs.k8s.io/gateway-api v1.2.1/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= -sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo= +sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE= +sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= sigs.k8s.io/kustomize/api v0.18.0 h1:hTzp67k+3NEVInwz5BHyzc9rGxIauoXferXyjv5lWPo= sigs.k8s.io/kustomize/api v0.18.0/go.mod h1:f8isXnX+8b+SGLHQ6yO4JG1rdkZlvhaCf/uZbLVMb0U= sigs.k8s.io/kustomize/kyaml v0.18.1 h1:WvBo56Wzw3fjS+7vBjN6TeivvpbW9GmRaWZ9CIVmt4E= @@ -2099,8 +2097,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZa sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= -sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA= -sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= +sigs.k8s.io/structured-merge-diff/v4 v4.5.0 h1:nbCitCK2hfnhyiKo6uf2HxUPTCodY6Qaf85SbDIaMBk= +sigs.k8s.io/structured-merge-diff/v4 v4.5.0/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= diff --git a/kubernetes-model-generator/openapi/schemas/openshift-generated.json b/kubernetes-model-generator/openapi/schemas/openshift-generated.json index 178c9f3cfa..9c885b08df 100644 --- a/kubernetes-model-generator/openapi/schemas/openshift-generated.json +++ b/kubernetes-model-generator/openapi/schemas/openshift-generated.json @@ -171,7 +171,7 @@ } }, "apiVersion": { - "description": "Version of the Alertmanager API that Prometheus uses to send alerts. It can be \"v1\" or \"v2\".", + "description": "Version of the Alertmanager API that Prometheus uses to send alerts. It can be \"V1\" or \"V2\". The field has no effect for Prometheus \u003e= v3.0.0 because only the v2 API is supported.", "type": "string" }, "authorization": { @@ -199,6 +199,10 @@ "description": "Namespace of the Endpoints object.\n\nIf not set, the object will be discovered in the namespace of the Prometheus object.", "type": "string" }, + "noProxy": { + "description": "`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names that should be excluded from proxying. IP and domain names can contain port numbers.\n\nIt requires Prometheus \u003e= v2.43.0 or Alertmanager \u003e= 0.25.0.", + "type": "string" + }, "pathPrefix": { "description": "Prefix for the HTTP path alerts are pushed to.", "type": "string" @@ -207,6 +211,25 @@ "description": "Port on which the Alertmanager API is exposed.", "$ref": "#/definitions/io.k8s.apimachinery.pkg.util.intstr.IntOrString" }, + "proxyConnectHeader": { + "description": "ProxyConnectHeader optionally specifies headers to send to proxies during CONNECT requests.\n\nIt requires Prometheus \u003e= v2.43.0 or Alertmanager \u003e= 0.25.0.", + "type": "object", + "additionalProperties": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector" + } + } + }, + "proxyFromEnvironment": { + "description": "Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).\n\nIt requires Prometheus \u003e= v2.43.0 or Alertmanager \u003e= 0.25.0.", + "type": "boolean" + }, + "proxyUrl": { + "description": "`proxyURL` defines the HTTP proxy server to use.", + "type": "string" + }, "relabelings": { "description": "Relabel configuration applied to the discovered Alertmanagers.", "type": "array", @@ -493,6 +516,10 @@ "description": "If set to true all actions on the underlying managed objects are not goint to be performed, except for delete actions.", "type": "boolean" }, + "persistentVolumeClaimRetentionPolicy": { + "description": "The field controls if and how PVCs are deleted during the lifecycle of a StatefulSet. The default behavior is all PVCs are retained. This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26. It requires enabling the StatefulSetAutoDeletePVC feature gate.", + "$ref": "#/definitions/io.k8s.api.apps.v1.StatefulSetPersistentVolumeClaimRetentionPolicy" + }, "podMetadata": { "description": "PodMetadata configures labels and annotations which are propagated to the Alertmanager pods.\n\nThe following items are reserved and cannot be overridden: * \"alertmanager\" label, set to the name of the Alertmanager instance. * \"app.kubernetes.io/instance\" label, set to the name of the Alertmanager instance. * \"app.kubernetes.io/managed-by\" label, set to \"prometheus-operator\". * \"app.kubernetes.io/name\" label, set to \"alertmanager\". * \"app.kubernetes.io/version\" label, set to the Alertmanager version. * \"kubectl.kubernetes.io/default-container\" annotation, set to \"alertmanager\".", "$ref": "#/definitions/com.coreos.monitoring.v1.EmbeddedObjectMetadata" @@ -959,6 +986,10 @@ "default": "" } }, + "enableOTLPReceiver": { + "description": "Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.\n\nNote that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.\n\nIt requires Prometheus \u003e= v2.47.0.", + "type": "boolean" + }, "enableRemoteWriteReceiver": { "description": "Enable Prometheus to be used as a receiver for the Prometheus remote write protocol.\n\nWARNING: This is not considered an efficient way of ingesting samples. Use it with caution for specific low-volume use cases. It is not suitable for replacing the ingestion via scraping and turning Prometheus into a push-based metrics collection system. For more information see https://prometheus.io/docs/prometheus/latest/querying/api/#remote-write-receiver\n\nIt requires Prometheus \u003e= v2.33.0.", "type": "boolean" @@ -1112,6 +1143,10 @@ "type": "integer", "format": "int64" }, + "nameValidationScheme": { + "description": "Specifies the validation scheme for metric and label names.", + "type": "string" + }, "nodeSelector": { "description": "Defines on which Nodes the Pods are scheduled.", "type": "object", @@ -1218,6 +1253,10 @@ "description": "The route prefix Prometheus registers HTTP handlers for.\n\nThis is useful when using `spec.externalURL`, and a proxy is rewriting HTTP routes of a request, and the actual ExternalURL is still true, but the server serves requests under a different route prefix. For example for use with `kubectl proxy`.", "type": "string" }, + "runtime": { + "description": "RuntimeConfig configures the values for the Prometheus process behavior", + "$ref": "#/definitions/com.coreos.monitoring.v1.RuntimeConfig" + }, "sampleLimit": { "description": "SampleLimit defines per-scrape limit on number of scraped samples that will be accepted. Only valid in Prometheus versions 2.45.0 and newer.\n\nNote that the global limit only applies to scrape objects that don't specify an explicit limit value. If you want to enforce a maximum limit for all scrape objects, refer to enforcedSampleLimit.", "type": "integer", @@ -1248,7 +1287,7 @@ "type": "string" }, "scrapeProtocols": { - "description": "The protocols to negotiate during a scrape. It tells clients the protocols supported by Prometheus in order of preference (from most to least preferred).\n\nIf unset, Prometheus uses its default value.\n\nIt requires Prometheus \u003e= v2.49.0.", + "description": "The protocols to negotiate during a scrape. It tells clients the protocols supported by Prometheus in order of preference (from most to least preferred).\n\nIf unset, Prometheus uses its default value.\n\nIt requires Prometheus \u003e= v2.49.0.\n\n`PrometheusText1.0.0` requires Prometheus \u003e= v3.0.0.", "type": "array", "items": { "type": "string", @@ -1289,7 +1328,7 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" }, "shards": { - "description": "Number of shards to distribute targets onto. `spec.replicas` multiplied by `spec.shards` is the total number of Pods created.\n\nNote that scaling down shards will not reshard data onto remaining instances, it must be manually moved. Increasing shards will not reshard data either but it will continue to be available from the same instances. To query globally, use Thanos sidecar and Thanos querier or remote write data to a central location.\n\nSharding is performed on the content of the `__address__` target meta-label for PodMonitors and ServiceMonitors and `__param_target__` for Probes.\n\nDefault: 1", + "description": "Number of shards to distribute scraped targets onto.\n\n`spec.replicas` multiplied by `spec.shards` is the total number of Pods being created.\n\nWhen not defined, the operator assumes only one shard.\n\nNote that scaling down shards will not reshard data onto the remaining instances, it must be manually moved. Increasing shards will not reshard data either but it will continue to be available from the same instances. To query globally, use Thanos sidecar and Thanos querier or remote write data to a central location. Alerting and recording rules\n\nBy default, the sharding is performed on: * The `__address__` target's metadata label for PodMonitor, ServiceMonitor and ScrapeConfig resources. * The `__param_target__` label for Probe resources.\n\nUsers can define their own sharding implementation by setting the `__tmp_hash` label during the target discovery with relabeling configuration (either in the monitoring resources or via scrape class).", "type": "integer", "format": "int32" }, @@ -2034,6 +2073,10 @@ "default": "" }, "x-kubernetes-list-type": "set" + }, + "translationStrategy": { + "description": "Configures how the OTLP receiver endpoint translates the incoming metrics. If unset, Prometheus uses its default value.\n\nIt requires Prometheus \u003e= v3.0.0.", + "type": "string" } }, "x-fabric8-info": { @@ -2215,9 +2258,14 @@ "type": "string" }, "port": { - "description": "Name of the Pod port which this endpoint refers to.\n\nIt takes precedence over `targetPort`.", + "description": "The `Pod` port name which exposes the endpoint.\n\nIt takes precedence over the `portNumber` and `targetPort` fields.", "type": "string" }, + "portNumber": { + "description": "The `Pod` port number which exposes the endpoint.", + "type": "integer", + "format": "int32" + }, "proxyUrl": { "description": "`proxyURL` configures the HTTP Proxy URL (e.g. \"http://proxyserver:2195\") to go through when scraping the target.", "type": "string" @@ -2239,7 +2287,7 @@ "type": "string" }, "targetPort": { - "description": "Name or number of the target port of the `Pod` object behind the Service, the port must be specified with container port property.\n\nDeprecated: use 'port' instead.", + "description": "Name or number of the target port of the `Pod` object behind the Service, the port must be specified with container port property.\n\nDeprecated: use 'port' or 'portNumber' instead.", "$ref": "#/definitions/io.k8s.apimachinery.pkg.util.intstr.IntOrString" }, "tlsConfig": { @@ -2343,6 +2391,10 @@ "description": "When defined, bodySizeLimit specifies a job level limit on the size of uncompressed response body that will be accepted by Prometheus.\n\nIt requires Prometheus \u003e= v2.28.0.", "type": "string" }, + "fallbackScrapeProtocol": { + "description": "The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.\n\nIt requires Prometheus \u003e= v3.0.0.", + "type": "string" + }, "jobLabel": { "description": "The label to use to retrieve the job name from. `jobLabel` selects the label from the associated Kubernetes `Pod` object which will be used as the `job` label for all metrics.\n\nFor example if `jobLabel` is set to `foo` and the Kubernetes `Pod` object is labeled with `foo: bar`, then Prometheus adds the `job=\"bar\"` label to all ingested metrics.\n\nIf the value of this field is empty, the `job` label of the metrics defaults to the namespace and name of the PodMonitor object (e.g. `\u003cnamespace\u003e/\u003cname\u003e`).", "type": "string" @@ -2424,6 +2476,10 @@ "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" }, + "selectorMechanism": { + "description": "Mechanism used to select the endpoints to scrape. By default, the selection process relies on relabel configurations to filter the discovered targets. Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters. Which strategy is best for your use case needs to be carefully evaluated.\n\nIt requires Prometheus \u003e= v2.17.0.", + "type": "string" + }, "targetLimit": { "description": "`targetLimit` defines a limit on the number of scraped targets that will be accepted.", "type": "integer", @@ -2524,6 +2580,10 @@ "default": {}, "$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector" }, + "fallbackScrapeProtocol": { + "description": "The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.\n\nIt requires Prometheus \u003e= v3.0.0.", + "type": "string" + }, "interval": { "description": "Interval at which targets are probed using the configured prober. If not specified Prometheus' global scrape interval is used.", "type": "string" @@ -3033,7 +3093,7 @@ } }, "disableCompaction": { - "description": "When true, the Prometheus compaction is disabled.", + "description": "When true, the Prometheus compaction is disabled. When `spec.thanos.objectStorageConfig` or `spec.objectStorageConfigFile` are defined, the operator automatically disables block compaction to avoid race conditions during block uploads (as the Thanos documentation recommends).", "type": "boolean" }, "dnsConfig": { @@ -3056,6 +3116,10 @@ "default": "" } }, + "enableOTLPReceiver": { + "description": "Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.\n\nNote that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.\n\nIt requires Prometheus \u003e= v2.47.0.", + "type": "boolean" + }, "enableRemoteWriteReceiver": { "description": "Enable Prometheus to be used as a receiver for the Prometheus remote write protocol.\n\nWARNING: This is not considered an efficient way of ingesting samples. Use it with caution for specific low-volume use cases. It is not suitable for replacing the ingestion via scraping and turning Prometheus into a push-based metrics collection system. For more information see https://prometheus.io/docs/prometheus/latest/querying/api/#remote-write-receiver\n\nIt requires Prometheus \u003e= v2.33.0.", "type": "boolean" @@ -3217,6 +3281,10 @@ "type": "integer", "format": "int64" }, + "nameValidationScheme": { + "description": "Specifies the validation scheme for metric and label names.", + "type": "string" + }, "nodeSelector": { "description": "Defines on which Nodes the Pods are scheduled.", "type": "object", @@ -3406,7 +3474,7 @@ "type": "string" }, "scrapeProtocols": { - "description": "The protocols to negotiate during a scrape. It tells clients the protocols supported by Prometheus in order of preference (from most to least preferred).\n\nIf unset, Prometheus uses its default value.\n\nIt requires Prometheus \u003e= v2.49.0.", + "description": "The protocols to negotiate during a scrape. It tells clients the protocols supported by Prometheus in order of preference (from most to least preferred).\n\nIf unset, Prometheus uses its default value.\n\nIt requires Prometheus \u003e= v2.49.0.\n\n`PrometheusText1.0.0` requires Prometheus \u003e= v3.0.0.", "type": "array", "items": { "type": "string", @@ -3451,7 +3519,7 @@ "type": "string" }, "shards": { - "description": "Number of shards to distribute targets onto. `spec.replicas` multiplied by `spec.shards` is the total number of Pods created.\n\nNote that scaling down shards will not reshard data onto remaining instances, it must be manually moved. Increasing shards will not reshard data either but it will continue to be available from the same instances. To query globally, use Thanos sidecar and Thanos querier or remote write data to a central location.\n\nSharding is performed on the content of the `__address__` target meta-label for PodMonitors and ServiceMonitors and `__param_target__` for Probes.\n\nDefault: 1", + "description": "Number of shards to distribute scraped targets onto.\n\n`spec.replicas` multiplied by `spec.shards` is the total number of Pods being created.\n\nWhen not defined, the operator assumes only one shard.\n\nNote that scaling down shards will not reshard data onto the remaining instances, it must be manually moved. Increasing shards will not reshard data either but it will continue to be available from the same instances. To query globally, use Thanos sidecar and Thanos querier or remote write data to a central location. Alerting and recording rules\n\nBy default, the sharding is performed on: * The `__address__` target's metadata label for PodMonitor, ServiceMonitor and ScrapeConfig resources. * The `__param_target__` label for Probe resources.\n\nUsers can define their own sharding implementation by setting the `__tmp_hash` label during the target discovery with relabeling configuration (either in the monitoring resources or via scrape class).", "type": "integer", "format": "int32" }, @@ -4162,6 +4230,14 @@ "description": "Interval determines how often rules in the group are evaluated.", "type": "string" }, + "labels": { + "description": "Labels to add or overwrite before storing the result for its rules. The labels defined at the rule level take precedence.\n\nIt requires Prometheus \u003e= 3.0.0. The field is ignored for Thanos Ruler.", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, "limit": { "description": "Limit the number of alerts an alerting rule and series a recording rule can produce. Limit is supported starting with Prometheus \u003e= 2.31 and Thanos Ruler \u003e= 0.24.", "type": "integer", @@ -4330,6 +4406,10 @@ "description": "AttachMetadata configures additional metadata to the discovered targets. When the scrape object defines its own configuration, it takes precedence over the scrape class configuration.", "$ref": "#/definitions/com.coreos.monitoring.v1.AttachMetadata" }, + "authorization": { + "description": "Authorization section for the ScrapeClass. It will only apply if the scrape resource doesn't specify any Authorization.", + "$ref": "#/definitions/com.coreos.monitoring.v1.Authorization" + }, "default": { "description": "Default indicates that the scrape applies to all scrape objects that don't configure an explicit scrape class name.\n\nOnly one scrape class can be set as the default.", "type": "boolean" @@ -4482,6 +4562,10 @@ "$ref": "#/definitions/com.coreos.monitoring.v1.Endpoint" } }, + "fallbackScrapeProtocol": { + "description": "The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.\n\nIt requires Prometheus \u003e= v3.0.0.", + "type": "string" + }, "jobLabel": { "description": "`jobLabel` selects the label from the associated Kubernetes `Service` object which will be used as the `job` label for all metrics.\n\nFor example if `jobLabel` is set to `foo` and the Kubernetes `Service` object is labeled with `foo: bar`, then Prometheus adds the `job=\"bar\"` label to all ingested metrics.\n\nIf the value of this field is empty or if the label doesn't exist for the given Service, the `job` label of the metrics defaults to the name of the associated Kubernetes `Service`.", "type": "string" @@ -4555,6 +4639,10 @@ "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" }, + "selectorMechanism": { + "description": "Mechanism used to select the endpoints to scrape. By default, the selection process relies on relabel configurations to filter the discovered targets. Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters. Which strategy is best for your use case needs to be carefully evaluated.\n\nIt requires Prometheus \u003e= v2.17.0.", + "type": "string" + }, "targetLabels": { "description": "`targetLabels` defines the labels which are transferred from the associated Kubernetes `Service` object onto the ingested metrics.", "type": "array", @@ -4850,7 +4938,7 @@ "$ref": "#/definitions/io.k8s.api.core.v1.Affinity" }, "alertDropLabels": { - "description": "AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts. The replica label `thanos_ruler_replica` will always be dropped in alerts.", + "description": "Configures the label names which should be dropped in Thanos Ruler alerts.\n\nThe replica label `thanos_ruler_replica` will always be dropped from the alerts.", "type": "array", "items": { "type": "string", @@ -4862,19 +4950,19 @@ "type": "string" }, "alertRelabelConfigFile": { - "description": "AlertRelabelConfigFile specifies the path of the alert relabeling configuration file. When used alongside with AlertRelabelConfigs, alertRelabelConfigFile takes precedence.", + "description": "Configures the path to the alert relabeling configuration file.\n\nAlert relabel configuration must have the form as specified in the official Prometheus documentation: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs\n\nThe operator performs no validation of the configuration file.\n\nThis field takes precedence over `alertRelabelConfig`.", "type": "string" }, "alertRelabelConfigs": { - "description": "AlertRelabelConfigs configures alert relabeling in ThanosRuler. Alert relabel configurations must have the form as specified in the official Prometheus documentation: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs Alternative to AlertRelabelConfigFile, and lower order priority.", + "description": "Configures alert relabeling in Thanos Ruler.\n\nAlert relabel configuration must have the form as specified in the official Prometheus documentation: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs\n\nThe operator performs no validation of the configuration.\n\n`alertRelabelConfigFile` takes precedence over this field.", "$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector" }, "alertmanagersConfig": { - "description": "Define configuration for connecting to alertmanager. Only available with thanos v0.10.0 and higher. Maps to the `alertmanagers.config` arg.", + "description": "Configures the list of Alertmanager endpoints to send alerts to.\n\nThe configuration format is defined at https://thanos.io/tip/components/rule.md/#alertmanager.\n\nIt requires Thanos \u003e= v0.10.0.\n\nThe operator performs no validation of the configuration.\n\nThis field takes precedence over `alertmanagersUrl`.", "$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector" }, "alertmanagersUrl": { - "description": "Define URLs to send alerts to Alertmanager. For Thanos v0.10.0 and higher, AlertManagersConfig should be used instead. Note: this field will be ignored if AlertManagersConfig is specified. Maps to the `alertmanagers.url` arg.", + "description": "Configures the list of Alertmanager endpoints to send alerts to.\n\nFor Thanos \u003e= v0.10.0, it is recommended to use `alertmanagersConfig` instead.\n\n`alertmanagersConfig` takes precedence over this field.", "type": "array", "items": { "type": "string", @@ -4963,7 +5051,7 @@ } }, "labels": { - "description": "Labels configure the external label pairs to ThanosRuler. A default replica label `thanos_ruler_replica` will be always added as a label with the value of the pod's name and it will be dropped in the alerts.", + "description": "Configures the external label pairs of the ThanosRuler resource.\n\nA default replica label `thanos_ruler_replica` will be always added as a label with the value of the pod's name.", "type": "object", "additionalProperties": { "type": "string", @@ -4996,11 +5084,11 @@ } }, "objectStorageConfig": { - "description": "ObjectStorageConfig configures object storage in Thanos. Alternative to ObjectStorageConfigFile, and lower order priority.", + "description": "Configures object storage.\n\nThe configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage\n\nThe operator performs no validation of the configuration.\n\n`objectStorageConfigFile` takes precedence over this field.", "$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector" }, "objectStorageConfigFile": { - "description": "ObjectStorageConfigFile specifies the path of the object storage configuration file. When used alongside with ObjectStorageConfig, ObjectStorageConfigFile takes precedence.", + "description": "Configures the path of the object storage configuration file.\n\nThe configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage\n\nThe operator performs no validation of the configuration file.\n\nThis field takes precedence over `objectStorageConfig`.", "type": "string" }, "paused": { @@ -5028,11 +5116,11 @@ } }, "queryConfig": { - "description": "Define configuration for connecting to thanos query instances. If this is defined, the QueryEndpoints field will be ignored. Maps to the `query.config` CLI argument. Only available with thanos v0.11.0 and higher.", + "description": "Configures the list of Thanos Query endpoints from which to query metrics.\n\nThe configuration format is defined at https://thanos.io/tip/components/rule.md/#query-api\n\nIt requires Thanos \u003e= v0.11.0.\n\nThe operator performs no validation of the configuration.\n\nThis field takes precedence over `queryEndpoints`.", "$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector" }, "queryEndpoints": { - "description": "QueryEndpoints defines Thanos querier endpoints from which to query metrics. Maps to the --query flag of thanos ruler.", + "description": "Configures the list of Thanos Query endpoints from which to query metrics.\n\nFor Thanos \u003e= v0.11.0, it is recommended to use `queryConfig` instead.\n\n`queryConfig` takes precedence over this field.", "type": "array", "items": { "type": "string", @@ -5062,7 +5150,7 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" }, "ruleSelector": { - "description": "A label selector to select which PrometheusRules to mount for alerting and recording.", + "description": "PrometheusRule objects to be selected for rule evaluation. An empty label selector matches all objects. A null label selector matches no objects.", "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" }, "securityContext": { @@ -5094,11 +5182,11 @@ } }, "tracingConfig": { - "description": "TracingConfig configures tracing in Thanos.\n\n`tracingConfigFile` takes precedence over this field.\n\nThis is an *experimental feature*, it may change in any upcoming release in a breaking way.", + "description": "Configures tracing.\n\nThe configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration\n\nThis is an *experimental feature*, it may change in any upcoming release in a breaking way.\n\nThe operator performs no validation of the configuration.\n\n`tracingConfigFile` takes precedence over this field.", "$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector" }, "tracingConfigFile": { - "description": "TracingConfig specifies the path of the tracing configuration file.\n\nThis field takes precedence over `tracingConfig`.\n\nThis is an *experimental feature*, it may change in any upcoming release in a breaking way.", + "description": "Configures the path of the tracing configuration file.\n\nThe configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration\n\nThis is an *experimental feature*, it may change in any upcoming release in a breaking way.\n\nThe operator performs no validation of the configuration file.\n\nThis field takes precedence over `tracingConfig`.", "type": "string" }, "version": { @@ -5743,11 +5831,11 @@ "type": "boolean" }, "authorization": { - "description": "Authorization header configuration to authenticate against the Consul Server.", + "description": "Optional Authorization header configuration to authenticate against the Consul Server. Cannot be set at the same time as `basicAuth`, or `oauth2`.", "$ref": "#/definitions/com.coreos.monitoring.v1.SafeAuthorization" }, "basicAuth": { - "description": "BasicAuth information to authenticate against the Consul Server. More info: https://prometheus.io/docs/operating/configuration/#endpoints", + "description": "Optional BasicAuth information to authenticate against the Consul Server. More info: https://prometheus.io/docs/operating/configuration/#endpoints Cannot be set at the same time as `authorization`, or `oauth2`.", "$ref": "#/definitions/com.coreos.monitoring.v1.BasicAuth" }, "datacenter": { @@ -5758,12 +5846,16 @@ "description": "Whether to enable HTTP2. If unset, Prometheus uses its default value.", "type": "boolean" }, + "filter": { + "description": "Filter expression used to filter the catalog results. See https://www.consul.io/api-docs/catalog#list-services It requires Prometheus \u003e= 3.0.0.", + "type": "string" + }, "followRedirects": { "description": "Configure whether HTTP requests follow HTTP 3xx redirects. If unset, Prometheus uses its default value.", "type": "boolean" }, "namespace": { - "description": "Namespaces are only supported in Consul Enterprise.", + "description": "Namespaces are only supported in Consul Enterprise.\n\nIt requires Prometheus \u003e= 2.28.0.", "type": "string" }, "noProxy": { @@ -5771,7 +5863,7 @@ "type": "string" }, "nodeMeta": { - "description": "Node metadata key/value pairs to filter nodes for a given service.", + "description": "Node metadata key/value pairs to filter nodes for a given service. Starting with Consul 1.14, it is recommended to use `filter` with the `NodeMeta` selector instead.", "type": "object", "additionalProperties": { "type": "string", @@ -5779,13 +5871,17 @@ } }, "oauth2": { - "description": "Optional OAuth 2.0 configuration.", + "description": "Optional OAuth2.0 configuration. Cannot be set at the same time as `basicAuth`, or `authorization`.", "$ref": "#/definitions/com.coreos.monitoring.v1.OAuth2" }, "partition": { "description": "Admin Partitions are only supported in Consul Enterprise.", "type": "string" }, + "pathPrefix": { + "description": "Prefix for URIs for when consul is behind an API gateway (reverse proxy).\n\nIt requires Prometheus \u003e= 2.45.0.", + "type": "string" + }, "proxyConnectHeader": { "description": "ProxyConnectHeader optionally specifies headers to send to proxies during CONNECT requests.\n\nIt requires Prometheus \u003e= v2.43.0 or Alertmanager \u003e= 0.25.0.", "type": "object", @@ -5814,7 +5910,7 @@ "type": "string" }, "server": { - "description": "A valid string consisting of a hostname or IP followed by an optional port number.", + "description": "Consul server address. A valid string consisting of a hostname or IP followed by an optional port number.", "type": "string", "default": "" }, @@ -5824,15 +5920,14 @@ "items": { "type": "string", "default": "" - }, - "x-kubernetes-list-type": "atomic" + } }, "tagSeparator": { "description": "The string by which Consul tags are joined into the tag label. If unset, Prometheus uses its default value.", "type": "string" }, "tags": { - "description": "An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.", + "description": "An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list. Starting with Consul 1.14, it is recommended to use `filter` with the `ServiceTags` selector instead.", "type": "array", "items": { "type": "string", @@ -5840,7 +5935,7 @@ } }, "tlsConfig": { - "description": "TLS Config", + "description": "TLS configuration to connect to the Consul API.", "$ref": "#/definitions/com.coreos.monitoring.v1.SafeTLSConfig" }, "tokenRef": { @@ -8004,6 +8099,10 @@ "default": "" } }, + "enableOTLPReceiver": { + "description": "Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.\n\nNote that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.\n\nIt requires Prometheus \u003e= v2.47.0.", + "type": "boolean" + }, "enableRemoteWriteReceiver": { "description": "Enable Prometheus to be used as a receiver for the Prometheus remote write protocol.\n\nWARNING: This is not considered an efficient way of ingesting samples. Use it with caution for specific low-volume use cases. It is not suitable for replacing the ingestion via scraping and turning Prometheus into a push-based metrics collection system. For more information see https://prometheus.io/docs/prometheus/latest/querying/api/#remote-write-receiver\n\nIt requires Prometheus \u003e= v2.33.0.", "type": "boolean" @@ -8161,6 +8260,10 @@ "description": "Mode defines how the Prometheus operator deploys the PrometheusAgent pod(s). For now this field has no effect.\n\n(Alpha) Using this field requires the `PrometheusAgentDaemonSet` feature gate to be enabled.", "type": "string" }, + "nameValidationScheme": { + "description": "Specifies the validation scheme for metric and label names.", + "type": "string" + }, "nodeSelector": { "description": "Defines on which Nodes the Pods are scheduled.", "type": "object", @@ -8267,6 +8370,10 @@ "description": "The route prefix Prometheus registers HTTP handlers for.\n\nThis is useful when using `spec.externalURL`, and a proxy is rewriting HTTP routes of a request, and the actual ExternalURL is still true, but the server serves requests under a different route prefix. For example for use with `kubectl proxy`.", "type": "string" }, + "runtime": { + "description": "RuntimeConfig configures the values for the Prometheus process behavior", + "$ref": "#/definitions/com.coreos.monitoring.v1.RuntimeConfig" + }, "sampleLimit": { "description": "SampleLimit defines per-scrape limit on number of scraped samples that will be accepted. Only valid in Prometheus versions 2.45.0 and newer.\n\nNote that the global limit only applies to scrape objects that don't specify an explicit limit value. If you want to enforce a maximum limit for all scrape objects, refer to enforcedSampleLimit.", "type": "integer", @@ -8297,7 +8404,7 @@ "type": "string" }, "scrapeProtocols": { - "description": "The protocols to negotiate during a scrape. It tells clients the protocols supported by Prometheus in order of preference (from most to least preferred).\n\nIf unset, Prometheus uses its default value.\n\nIt requires Prometheus \u003e= v2.49.0.", + "description": "The protocols to negotiate during a scrape. It tells clients the protocols supported by Prometheus in order of preference (from most to least preferred).\n\nIf unset, Prometheus uses its default value.\n\nIt requires Prometheus \u003e= v2.49.0.\n\n`PrometheusText1.0.0` requires Prometheus \u003e= v3.0.0.", "type": "array", "items": { "type": "string", @@ -8338,7 +8445,7 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" }, "shards": { - "description": "Number of shards to distribute targets onto. `spec.replicas` multiplied by `spec.shards` is the total number of Pods created.\n\nNote that scaling down shards will not reshard data onto remaining instances, it must be manually moved. Increasing shards will not reshard data either but it will continue to be available from the same instances. To query globally, use Thanos sidecar and Thanos querier or remote write data to a central location.\n\nSharding is performed on the content of the `__address__` target meta-label for PodMonitors and ServiceMonitors and `__param_target__` for Probes.\n\nDefault: 1", + "description": "Number of shards to distribute scraped targets onto.\n\n`spec.replicas` multiplied by `spec.shards` is the total number of Pods being created.\n\nWhen not defined, the operator assumes only one shard.\n\nNote that scaling down shards will not reshard data onto the remaining instances, it must be manually moved. Increasing shards will not reshard data either but it will continue to be available from the same instances. To query globally, use Thanos sidecar and Thanos querier or remote write data to a central location. Alerting and recording rules\n\nBy default, the sharding is performed on: * The `__address__` target's metadata label for PodMonitor, ServiceMonitor and ScrapeConfig resources. * The `__param_target__` label for Probe resources.\n\nUsers can define their own sharding implementation by setting the `__tmp_hash` label during the target discovery with relabeling configuration (either in the monitoring resources or via scrape class).", "type": "integer", "format": "int32" }, @@ -9079,6 +9186,10 @@ "description": "When false, Prometheus will request uncompressed response from the scraped target.\n\nIt requires Prometheus \u003e= v2.49.0.\n\nIf unset, Prometheus uses true by default.", "type": "boolean" }, + "enableHTTP2": { + "description": "Whether to enable HTTP2.", + "type": "boolean" + }, "eurekaSDConfigs": { "description": "EurekaSDConfigs defines a list of Eureka service discovery configurations.", "type": "array", @@ -9087,6 +9198,10 @@ "$ref": "#/definitions/com.coreos.monitoring.v1alpha1.EurekaSDConfig" } }, + "fallbackScrapeProtocol": { + "description": "The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.\n\nIt requires Prometheus \u003e= v3.0.0.", + "type": "string" + }, "fileSDConfigs": { "description": "FileSDConfigs defines a list of file service discovery configurations.", "type": "array", @@ -9625,6 +9740,11 @@ "description": "Message template", "type": "string" }, + "messageThreadID": { + "description": "The Telegram Group Topic ID. It requires Alertmanager \u003e= 0.26.0.", + "type": "integer", + "format": "int64" + }, "parseMode": { "description": "Parse mode for telegram message", "type": "string" @@ -11199,6 +11319,11 @@ "description": "Message template", "type": "string" }, + "messageThreadID": { + "description": "The Telegram Group Topic ID. It requires Alertmanager \u003e= 0.26.0.", + "type": "integer", + "format": "int64" + }, "parseMode": { "description": "Parse mode for telegram message", "type": "string" diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AlertmanagerEndpoints.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AlertmanagerEndpoints.java index 688620e0ca..352f6639cf 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AlertmanagerEndpoints.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AlertmanagerEndpoints.java @@ -26,6 +26,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.api.model.SecretKeySelector; import io.fabric8.kubernetes.api.model.Volume; import io.fabric8.kubernetes.api.model.VolumeMount; import io.sundr.builder.annotations.Buildable; @@ -45,8 +46,12 @@ "enableHttp2", "name", "namespace", + "noProxy", "pathPrefix", "port", + "proxyConnectHeader", + "proxyFromEnvironment", + "proxyUrl", "relabelings", "scheme", "sigv4", @@ -95,10 +100,19 @@ public class AlertmanagerEndpoints implements Editable> proxyConnectHeader = new LinkedHashMap<>(); + @JsonProperty("proxyFromEnvironment") + private Boolean proxyFromEnvironment; + @JsonProperty("proxyUrl") + private String proxyUrl; @JsonProperty("relabelings") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List relabelings = new ArrayList<>(); @@ -120,7 +134,7 @@ public class AlertmanagerEndpoints implements Editable alertRelabelings, String apiVersion, SafeAuthorization authorization, BasicAuth basicAuth, String bearerTokenFile, Boolean enableHttp2, String name, String namespace, String pathPrefix, IntOrString port, List relabelings, String scheme, Sigv4 sigv4, String timeout, TLSConfig tlsConfig) { + public AlertmanagerEndpoints(List alertRelabelings, String apiVersion, SafeAuthorization authorization, BasicAuth basicAuth, String bearerTokenFile, Boolean enableHttp2, String name, String namespace, String noProxy, String pathPrefix, IntOrString port, Map> proxyConnectHeader, Boolean proxyFromEnvironment, String proxyUrl, List relabelings, String scheme, Sigv4 sigv4, String timeout, TLSConfig tlsConfig) { super(); this.alertRelabelings = alertRelabelings; this.apiVersion = apiVersion; @@ -130,8 +144,12 @@ public AlertmanagerEndpoints(List alertRelabelings, String apiVer this.enableHttp2 = enableHttp2; this.name = name; this.namespace = namespace; + this.noProxy = noProxy; this.pathPrefix = pathPrefix; this.port = port; + this.proxyConnectHeader = proxyConnectHeader; + this.proxyFromEnvironment = proxyFromEnvironment; + this.proxyUrl = proxyUrl; this.relabelings = relabelings; this.scheme = scheme; this.sigv4 = sigv4; @@ -220,6 +238,16 @@ public void setNamespace(String namespace) { this.namespace = namespace; } + @JsonProperty("noProxy") + public String getNoProxy() { + return noProxy; + } + + @JsonProperty("noProxy") + public void setNoProxy(String noProxy) { + this.noProxy = noProxy; + } + @JsonProperty("pathPrefix") public String getPathPrefix() { return pathPrefix; @@ -240,6 +268,37 @@ public void setPort(IntOrString port) { this.port = port; } + @JsonProperty("proxyConnectHeader") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map> getProxyConnectHeader() { + return proxyConnectHeader; + } + + @JsonProperty("proxyConnectHeader") + public void setProxyConnectHeader(Map> proxyConnectHeader) { + this.proxyConnectHeader = proxyConnectHeader; + } + + @JsonProperty("proxyFromEnvironment") + public Boolean getProxyFromEnvironment() { + return proxyFromEnvironment; + } + + @JsonProperty("proxyFromEnvironment") + public void setProxyFromEnvironment(Boolean proxyFromEnvironment) { + this.proxyFromEnvironment = proxyFromEnvironment; + } + + @JsonProperty("proxyUrl") + public String getProxyUrl() { + return proxyUrl; + } + + @JsonProperty("proxyUrl") + public void setProxyUrl(String proxyUrl) { + this.proxyUrl = proxyUrl; + } + @JsonProperty("relabelings") @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getRelabelings() { diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AlertmanagerSpec.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AlertmanagerSpec.java index 358ca2d4a7..48480aeb1e 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AlertmanagerSpec.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AlertmanagerSpec.java @@ -32,6 +32,7 @@ import io.fabric8.kubernetes.api.model.TopologySpreadConstraint; import io.fabric8.kubernetes.api.model.Volume; import io.fabric8.kubernetes.api.model.VolumeMount; +import io.fabric8.kubernetes.api.model.apps.StatefulSetPersistentVolumeClaimRetentionPolicy; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -73,6 +74,7 @@ "minReadySeconds", "nodeSelector", "paused", + "persistentVolumeClaimRetentionPolicy", "podMetadata", "portName", "priorityClassName", @@ -190,6 +192,8 @@ public class AlertmanagerSpec implements Editable, Kube private Map nodeSelector = new LinkedHashMap<>(); @JsonProperty("paused") private Boolean paused; + @JsonProperty("persistentVolumeClaimRetentionPolicy") + private StatefulSetPersistentVolumeClaimRetentionPolicy persistentVolumeClaimRetentionPolicy; @JsonProperty("podMetadata") private EmbeddedObjectMetadata podMetadata; @JsonProperty("portName") @@ -243,7 +247,7 @@ public class AlertmanagerSpec implements Editable, Kube public AlertmanagerSpec() { } - public AlertmanagerSpec(List additionalPeers, Affinity affinity, AlertmanagerConfigMatcherStrategy alertmanagerConfigMatcherStrategy, LabelSelector alertmanagerConfigNamespaceSelector, LabelSelector alertmanagerConfigSelector, AlertmanagerConfiguration alertmanagerConfiguration, Boolean automountServiceAccountToken, String baseImage, String clusterAdvertiseAddress, String clusterGossipInterval, String clusterLabel, String clusterPeerTimeout, String clusterPushpullInterval, List configMaps, String configSecret, List containers, PodDNSConfig dnsConfig, String dnsPolicy, List enableFeatures, String externalUrl, Boolean forceEnableClusterMode, List hostAliases, String image, String imagePullPolicy, List imagePullSecrets, List initContainers, Boolean listenLocal, String logFormat, String logLevel, Long minReadySeconds, Map nodeSelector, Boolean paused, EmbeddedObjectMetadata podMetadata, String portName, String priorityClassName, Integer replicas, ResourceRequirements resources, String retention, String routePrefix, List secrets, PodSecurityContext securityContext, String serviceAccountName, String sha, StorageSpec storage, String tag, List tolerations, List topologySpreadConstraints, String version, List volumeMounts, List volumes, AlertmanagerWebSpec web) { + public AlertmanagerSpec(List additionalPeers, Affinity affinity, AlertmanagerConfigMatcherStrategy alertmanagerConfigMatcherStrategy, LabelSelector alertmanagerConfigNamespaceSelector, LabelSelector alertmanagerConfigSelector, AlertmanagerConfiguration alertmanagerConfiguration, Boolean automountServiceAccountToken, String baseImage, String clusterAdvertiseAddress, String clusterGossipInterval, String clusterLabel, String clusterPeerTimeout, String clusterPushpullInterval, List configMaps, String configSecret, List containers, PodDNSConfig dnsConfig, String dnsPolicy, List enableFeatures, String externalUrl, Boolean forceEnableClusterMode, List hostAliases, String image, String imagePullPolicy, List imagePullSecrets, List initContainers, Boolean listenLocal, String logFormat, String logLevel, Long minReadySeconds, Map nodeSelector, Boolean paused, StatefulSetPersistentVolumeClaimRetentionPolicy persistentVolumeClaimRetentionPolicy, EmbeddedObjectMetadata podMetadata, String portName, String priorityClassName, Integer replicas, ResourceRequirements resources, String retention, String routePrefix, List secrets, PodSecurityContext securityContext, String serviceAccountName, String sha, StorageSpec storage, String tag, List tolerations, List topologySpreadConstraints, String version, List volumeMounts, List volumes, AlertmanagerWebSpec web) { super(); this.additionalPeers = additionalPeers; this.affinity = affinity; @@ -277,6 +281,7 @@ public AlertmanagerSpec(List additionalPeers, Affinity affinity, Alertma this.minReadySeconds = minReadySeconds; this.nodeSelector = nodeSelector; this.paused = paused; + this.persistentVolumeClaimRetentionPolicy = persistentVolumeClaimRetentionPolicy; this.podMetadata = podMetadata; this.portName = portName; this.priorityClassName = priorityClassName; @@ -626,6 +631,16 @@ public void setPaused(Boolean paused) { this.paused = paused; } + @JsonProperty("persistentVolumeClaimRetentionPolicy") + public StatefulSetPersistentVolumeClaimRetentionPolicy getPersistentVolumeClaimRetentionPolicy() { + return persistentVolumeClaimRetentionPolicy; + } + + @JsonProperty("persistentVolumeClaimRetentionPolicy") + public void setPersistentVolumeClaimRetentionPolicy(StatefulSetPersistentVolumeClaimRetentionPolicy persistentVolumeClaimRetentionPolicy) { + this.persistentVolumeClaimRetentionPolicy = persistentVolumeClaimRetentionPolicy; + } + @JsonProperty("podMetadata") public EmbeddedObjectMetadata getPodMetadata() { return podMetadata; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/CommonPrometheusFields.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/CommonPrometheusFields.java index c7c5931fe2..c01d0a2446 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/CommonPrometheusFields.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/CommonPrometheusFields.java @@ -54,6 +54,7 @@ "dnsConfig", "dnsPolicy", "enableFeatures", + "enableOTLPReceiver", "enableRemoteWriteReceiver", "enforcedBodySizeLimit", "enforcedKeepDroppedTargets", @@ -82,6 +83,7 @@ "logLevel", "maximumStartupDurationSeconds", "minReadySeconds", + "nameValidationScheme", "nodeSelector", "otlp", "overrideHonorLabels", @@ -104,6 +106,7 @@ "replicas", "resources", "routePrefix", + "runtime", "sampleLimit", "scrapeClasses", "scrapeConfigNamespaceSelector", @@ -183,6 +186,8 @@ public class CommonPrometheusFields implements Editable enableFeatures = new ArrayList<>(); + @JsonProperty("enableOTLPReceiver") + private Boolean enableOTLPReceiver; @JsonProperty("enableRemoteWriteReceiver") private Boolean enableRemoteWriteReceiver; @JsonProperty("enforcedBodySizeLimit") @@ -244,6 +249,8 @@ public class CommonPrometheusFields implements Editable nodeSelector = new LinkedHashMap<>(); @@ -292,6 +299,8 @@ public class CommonPrometheusFields implements Editable additionalArgs, SecretKeySelector additionalScrapeConfigs, Affinity affinity, APIServerConfig apiserverConfig, ArbitraryFSAccessThroughSMsConfig arbitraryFSAccessThroughSMs, Boolean automountServiceAccountToken, String bodySizeLimit, List configMaps, List containers, PodDNSConfig dnsConfig, String dnsPolicy, List enableFeatures, Boolean enableRemoteWriteReceiver, String enforcedBodySizeLimit, Long enforcedKeepDroppedTargets, Long enforcedLabelLimit, Long enforcedLabelNameLengthLimit, Long enforcedLabelValueLengthLimit, String enforcedNamespaceLabel, Long enforcedSampleLimit, Long enforcedTargetLimit, List excludedFromEnforcement, Map externalLabels, String externalUrl, List hostAliases, Boolean hostNetwork, Boolean ignoreNamespaceSelectors, String image, String imagePullPolicy, List imagePullSecrets, List initContainers, Long keepDroppedTargets, Long labelLimit, Long labelNameLengthLimit, Long labelValueLengthLimit, Boolean listenLocal, String logFormat, String logLevel, Integer maximumStartupDurationSeconds, Long minReadySeconds, Map nodeSelector, OTLPConfig otlp, Boolean overrideHonorLabels, Boolean overrideHonorTimestamps, Boolean paused, StatefulSetPersistentVolumeClaimRetentionPolicy persistentVolumeClaimRetentionPolicy, EmbeddedObjectMetadata podMetadata, LabelSelector podMonitorNamespaceSelector, LabelSelector podMonitorSelector, List podTargetLabels, String portName, String priorityClassName, LabelSelector probeNamespaceSelector, LabelSelector probeSelector, String prometheusExternalLabelName, String reloadStrategy, List remoteWrite, List remoteWriteReceiverMessageVersions, String replicaExternalLabelName, Integer replicas, ResourceRequirements resources, String routePrefix, Long sampleLimit, List scrapeClasses, LabelSelector scrapeConfigNamespaceSelector, LabelSelector scrapeConfigSelector, String scrapeInterval, List scrapeProtocols, String scrapeTimeout, List secrets, PodSecurityContext securityContext, String serviceAccountName, String serviceDiscoveryRole, LabelSelector serviceMonitorNamespaceSelector, LabelSelector serviceMonitorSelector, Integer shards, StorageSpec storage, Long targetLimit, List tolerations, List topologySpreadConstraints, PrometheusTracingConfig tracingConfig, TSDBSpec tsdb, String version, List volumeMounts, List volumes, Boolean walCompression, PrometheusWebSpec web) { + public CommonPrometheusFields(List additionalArgs, SecretKeySelector additionalScrapeConfigs, Affinity affinity, APIServerConfig apiserverConfig, ArbitraryFSAccessThroughSMsConfig arbitraryFSAccessThroughSMs, Boolean automountServiceAccountToken, String bodySizeLimit, List configMaps, List containers, PodDNSConfig dnsConfig, String dnsPolicy, List enableFeatures, Boolean enableOTLPReceiver, Boolean enableRemoteWriteReceiver, String enforcedBodySizeLimit, Long enforcedKeepDroppedTargets, Long enforcedLabelLimit, Long enforcedLabelNameLengthLimit, Long enforcedLabelValueLengthLimit, String enforcedNamespaceLabel, Long enforcedSampleLimit, Long enforcedTargetLimit, List excludedFromEnforcement, Map externalLabels, String externalUrl, List hostAliases, Boolean hostNetwork, Boolean ignoreNamespaceSelectors, String image, String imagePullPolicy, List imagePullSecrets, List initContainers, Long keepDroppedTargets, Long labelLimit, Long labelNameLengthLimit, Long labelValueLengthLimit, Boolean listenLocal, String logFormat, String logLevel, Integer maximumStartupDurationSeconds, Long minReadySeconds, String nameValidationScheme, Map nodeSelector, OTLPConfig otlp, Boolean overrideHonorLabels, Boolean overrideHonorTimestamps, Boolean paused, StatefulSetPersistentVolumeClaimRetentionPolicy persistentVolumeClaimRetentionPolicy, EmbeddedObjectMetadata podMetadata, LabelSelector podMonitorNamespaceSelector, LabelSelector podMonitorSelector, List podTargetLabels, String portName, String priorityClassName, LabelSelector probeNamespaceSelector, LabelSelector probeSelector, String prometheusExternalLabelName, String reloadStrategy, List remoteWrite, List remoteWriteReceiverMessageVersions, String replicaExternalLabelName, Integer replicas, ResourceRequirements resources, String routePrefix, RuntimeConfig runtime, Long sampleLimit, List scrapeClasses, LabelSelector scrapeConfigNamespaceSelector, LabelSelector scrapeConfigSelector, String scrapeInterval, List scrapeProtocols, String scrapeTimeout, List secrets, PodSecurityContext securityContext, String serviceAccountName, String serviceDiscoveryRole, LabelSelector serviceMonitorNamespaceSelector, LabelSelector serviceMonitorSelector, Integer shards, StorageSpec storage, Long targetLimit, List tolerations, List topologySpreadConstraints, PrometheusTracingConfig tracingConfig, TSDBSpec tsdb, String version, List volumeMounts, List volumes, Boolean walCompression, PrometheusWebSpec web) { super(); this.additionalArgs = additionalArgs; this.additionalScrapeConfigs = additionalScrapeConfigs; @@ -373,6 +382,7 @@ public CommonPrometheusFields(List additionalArgs, SecretKeySelector a this.dnsConfig = dnsConfig; this.dnsPolicy = dnsPolicy; this.enableFeatures = enableFeatures; + this.enableOTLPReceiver = enableOTLPReceiver; this.enableRemoteWriteReceiver = enableRemoteWriteReceiver; this.enforcedBodySizeLimit = enforcedBodySizeLimit; this.enforcedKeepDroppedTargets = enforcedKeepDroppedTargets; @@ -401,6 +411,7 @@ public CommonPrometheusFields(List additionalArgs, SecretKeySelector a this.logLevel = logLevel; this.maximumStartupDurationSeconds = maximumStartupDurationSeconds; this.minReadySeconds = minReadySeconds; + this.nameValidationScheme = nameValidationScheme; this.nodeSelector = nodeSelector; this.otlp = otlp; this.overrideHonorLabels = overrideHonorLabels; @@ -423,6 +434,7 @@ public CommonPrometheusFields(List additionalArgs, SecretKeySelector a this.replicas = replicas; this.resources = resources; this.routePrefix = routePrefix; + this.runtime = runtime; this.sampleLimit = sampleLimit; this.scrapeClasses = scrapeClasses; this.scrapeConfigNamespaceSelector = scrapeConfigNamespaceSelector; @@ -574,6 +586,16 @@ public void setEnableFeatures(List enableFeatures) { this.enableFeatures = enableFeatures; } + @JsonProperty("enableOTLPReceiver") + public Boolean getEnableOTLPReceiver() { + return enableOTLPReceiver; + } + + @JsonProperty("enableOTLPReceiver") + public void setEnableOTLPReceiver(Boolean enableOTLPReceiver) { + this.enableOTLPReceiver = enableOTLPReceiver; + } + @JsonProperty("enableRemoteWriteReceiver") public Boolean getEnableRemoteWriteReceiver() { return enableRemoteWriteReceiver; @@ -859,6 +881,16 @@ public void setMinReadySeconds(Long minReadySeconds) { this.minReadySeconds = minReadySeconds; } + @JsonProperty("nameValidationScheme") + public String getNameValidationScheme() { + return nameValidationScheme; + } + + @JsonProperty("nameValidationScheme") + public void setNameValidationScheme(String nameValidationScheme) { + this.nameValidationScheme = nameValidationScheme; + } + @JsonProperty("nodeSelector") @JsonInclude(JsonInclude.Include.NON_EMPTY) public Map getNodeSelector() { @@ -1083,6 +1115,16 @@ public void setRoutePrefix(String routePrefix) { this.routePrefix = routePrefix; } + @JsonProperty("runtime") + public RuntimeConfig getRuntime() { + return runtime; + } + + @JsonProperty("runtime") + public void setRuntime(RuntimeConfig runtime) { + this.runtime = runtime; + } + @JsonProperty("sampleLimit") public Long getSampleLimit() { return sampleLimit; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/OTLPConfig.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/OTLPConfig.java index df40fe4214..c8966cca5c 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/OTLPConfig.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/OTLPConfig.java @@ -37,7 +37,8 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "promoteResourceAttributes" + "promoteResourceAttributes", + "translationStrategy" }) @ToString @EqualsAndHashCode @@ -67,6 +68,8 @@ public class OTLPConfig implements Editable, KubernetesResour @JsonProperty("promoteResourceAttributes") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List promoteResourceAttributes = new ArrayList<>(); + @JsonProperty("translationStrategy") + private String translationStrategy; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -77,9 +80,10 @@ public class OTLPConfig implements Editable, KubernetesResour public OTLPConfig() { } - public OTLPConfig(List promoteResourceAttributes) { + public OTLPConfig(List promoteResourceAttributes, String translationStrategy) { super(); this.promoteResourceAttributes = promoteResourceAttributes; + this.translationStrategy = translationStrategy; } @JsonProperty("promoteResourceAttributes") @@ -93,6 +97,16 @@ public void setPromoteResourceAttributes(List promoteResourceAttributes) this.promoteResourceAttributes = promoteResourceAttributes; } + @JsonProperty("translationStrategy") + public String getTranslationStrategy() { + return translationStrategy; + } + + @JsonProperty("translationStrategy") + public void setTranslationStrategy(String translationStrategy) { + this.translationStrategy = translationStrategy; + } + @JsonIgnore public OTLPConfigBuilder edit() { return new OTLPConfigBuilder(this); diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMetricsEndpoint.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMetricsEndpoint.java index 6d84ed9a23..69b7808571 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMetricsEndpoint.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMetricsEndpoint.java @@ -52,6 +52,7 @@ "params", "path", "port", + "portNumber", "proxyUrl", "relabelings", "scheme", @@ -115,6 +116,8 @@ public class PodMetricsEndpoint implements Editable, private String path; @JsonProperty("port") private String port; + @JsonProperty("portNumber") + private Integer portNumber; @JsonProperty("proxyUrl") private String proxyUrl; @JsonProperty("relabelings") @@ -140,7 +143,7 @@ public class PodMetricsEndpoint implements Editable, public PodMetricsEndpoint() { } - public PodMetricsEndpoint(SafeAuthorization authorization, BasicAuth basicAuth, SecretKeySelector bearerTokenSecret, Boolean enableHttp2, Boolean filterRunning, Boolean followRedirects, Boolean honorLabels, Boolean honorTimestamps, String interval, List metricRelabelings, OAuth2 oauth2, Map> params, String path, String port, String proxyUrl, List relabelings, String scheme, String scrapeTimeout, IntOrString targetPort, SafeTLSConfig tlsConfig, Boolean trackTimestampsStaleness) { + public PodMetricsEndpoint(SafeAuthorization authorization, BasicAuth basicAuth, SecretKeySelector bearerTokenSecret, Boolean enableHttp2, Boolean filterRunning, Boolean followRedirects, Boolean honorLabels, Boolean honorTimestamps, String interval, List metricRelabelings, OAuth2 oauth2, Map> params, String path, String port, Integer portNumber, String proxyUrl, List relabelings, String scheme, String scrapeTimeout, IntOrString targetPort, SafeTLSConfig tlsConfig, Boolean trackTimestampsStaleness) { super(); this.authorization = authorization; this.basicAuth = basicAuth; @@ -156,6 +159,7 @@ public PodMetricsEndpoint(SafeAuthorization authorization, BasicAuth basicAuth, this.params = params; this.path = path; this.port = port; + this.portNumber = portNumber; this.proxyUrl = proxyUrl; this.relabelings = relabelings; this.scheme = scheme; @@ -307,6 +311,16 @@ public void setPort(String port) { this.port = port; } + @JsonProperty("portNumber") + public Integer getPortNumber() { + return portNumber; + } + + @JsonProperty("portNumber") + public void setPortNumber(Integer portNumber) { + this.portNumber = portNumber; + } + @JsonProperty("proxyUrl") public String getProxyUrl() { return proxyUrl; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMonitorSpec.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMonitorSpec.java index 540fda1e10..357a30ab05 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMonitorSpec.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMonitorSpec.java @@ -40,6 +40,7 @@ @JsonPropertyOrder({ "attachMetadata", "bodySizeLimit", + "fallbackScrapeProtocol", "jobLabel", "keepDroppedTargets", "labelLimit", @@ -55,6 +56,7 @@ "scrapeClassicHistograms", "scrapeProtocols", "selector", + "selectorMechanism", "targetLimit" }) @ToString @@ -86,6 +88,8 @@ public class PodMonitorSpec implements Editable, Kubernet private AttachMetadata attachMetadata; @JsonProperty("bodySizeLimit") private String bodySizeLimit; + @JsonProperty("fallbackScrapeProtocol") + private String fallbackScrapeProtocol; @JsonProperty("jobLabel") private String jobLabel; @JsonProperty("keepDroppedTargets") @@ -119,6 +123,8 @@ public class PodMonitorSpec implements Editable, Kubernet private List scrapeProtocols = new ArrayList<>(); @JsonProperty("selector") private LabelSelector selector; + @JsonProperty("selectorMechanism") + private String selectorMechanism; @JsonProperty("targetLimit") private Long targetLimit; @JsonIgnore @@ -131,10 +137,11 @@ public class PodMonitorSpec implements Editable, Kubernet public PodMonitorSpec() { } - public PodMonitorSpec(AttachMetadata attachMetadata, String bodySizeLimit, String jobLabel, Long keepDroppedTargets, Long labelLimit, Long labelNameLengthLimit, Long labelValueLengthLimit, NamespaceSelector namespaceSelector, Long nativeHistogramBucketLimit, Quantity nativeHistogramMinBucketFactor, List podMetricsEndpoints, List podTargetLabels, Long sampleLimit, String scrapeClass, Boolean scrapeClassicHistograms, List scrapeProtocols, LabelSelector selector, Long targetLimit) { + public PodMonitorSpec(AttachMetadata attachMetadata, String bodySizeLimit, String fallbackScrapeProtocol, String jobLabel, Long keepDroppedTargets, Long labelLimit, Long labelNameLengthLimit, Long labelValueLengthLimit, NamespaceSelector namespaceSelector, Long nativeHistogramBucketLimit, Quantity nativeHistogramMinBucketFactor, List podMetricsEndpoints, List podTargetLabels, Long sampleLimit, String scrapeClass, Boolean scrapeClassicHistograms, List scrapeProtocols, LabelSelector selector, String selectorMechanism, Long targetLimit) { super(); this.attachMetadata = attachMetadata; this.bodySizeLimit = bodySizeLimit; + this.fallbackScrapeProtocol = fallbackScrapeProtocol; this.jobLabel = jobLabel; this.keepDroppedTargets = keepDroppedTargets; this.labelLimit = labelLimit; @@ -150,6 +157,7 @@ public PodMonitorSpec(AttachMetadata attachMetadata, String bodySizeLimit, Strin this.scrapeClassicHistograms = scrapeClassicHistograms; this.scrapeProtocols = scrapeProtocols; this.selector = selector; + this.selectorMechanism = selectorMechanism; this.targetLimit = targetLimit; } @@ -173,6 +181,16 @@ public void setBodySizeLimit(String bodySizeLimit) { this.bodySizeLimit = bodySizeLimit; } + @JsonProperty("fallbackScrapeProtocol") + public String getFallbackScrapeProtocol() { + return fallbackScrapeProtocol; + } + + @JsonProperty("fallbackScrapeProtocol") + public void setFallbackScrapeProtocol(String fallbackScrapeProtocol) { + this.fallbackScrapeProtocol = fallbackScrapeProtocol; + } + @JsonProperty("jobLabel") public String getJobLabel() { return jobLabel; @@ -326,6 +344,16 @@ public void setSelector(LabelSelector selector) { this.selector = selector; } + @JsonProperty("selectorMechanism") + public String getSelectorMechanism() { + return selectorMechanism; + } + + @JsonProperty("selectorMechanism") + public void setSelectorMechanism(String selectorMechanism) { + this.selectorMechanism = selectorMechanism; + } + @JsonProperty("targetLimit") public Long getTargetLimit() { return targetLimit; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ProbeSpec.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ProbeSpec.java index 177330ab15..2ff6cb4240 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ProbeSpec.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ProbeSpec.java @@ -42,6 +42,7 @@ "authorization", "basicAuth", "bearerTokenSecret", + "fallbackScrapeProtocol", "interval", "jobName", "keepDroppedTargets", @@ -94,6 +95,8 @@ public class ProbeSpec implements Editable, KubernetesResource private BasicAuth basicAuth; @JsonProperty("bearerTokenSecret") private SecretKeySelector bearerTokenSecret; + @JsonProperty("fallbackScrapeProtocol") + private String fallbackScrapeProtocol; @JsonProperty("interval") private String interval; @JsonProperty("jobName") @@ -146,11 +149,12 @@ public class ProbeSpec implements Editable, KubernetesResource public ProbeSpec() { } - public ProbeSpec(SafeAuthorization authorization, BasicAuth basicAuth, SecretKeySelector bearerTokenSecret, String interval, String jobName, Long keepDroppedTargets, Long labelLimit, Long labelNameLengthLimit, Long labelValueLengthLimit, List metricRelabelings, String module, Long nativeHistogramBucketLimit, Quantity nativeHistogramMinBucketFactor, OAuth2 oauth2, ProberSpec prober, Long sampleLimit, String scrapeClass, Boolean scrapeClassicHistograms, List scrapeProtocols, String scrapeTimeout, Long targetLimit, ProbeTargets targets, SafeTLSConfig tlsConfig) { + public ProbeSpec(SafeAuthorization authorization, BasicAuth basicAuth, SecretKeySelector bearerTokenSecret, String fallbackScrapeProtocol, String interval, String jobName, Long keepDroppedTargets, Long labelLimit, Long labelNameLengthLimit, Long labelValueLengthLimit, List metricRelabelings, String module, Long nativeHistogramBucketLimit, Quantity nativeHistogramMinBucketFactor, OAuth2 oauth2, ProberSpec prober, Long sampleLimit, String scrapeClass, Boolean scrapeClassicHistograms, List scrapeProtocols, String scrapeTimeout, Long targetLimit, ProbeTargets targets, SafeTLSConfig tlsConfig) { super(); this.authorization = authorization; this.basicAuth = basicAuth; this.bearerTokenSecret = bearerTokenSecret; + this.fallbackScrapeProtocol = fallbackScrapeProtocol; this.interval = interval; this.jobName = jobName; this.keepDroppedTargets = keepDroppedTargets; @@ -203,6 +207,16 @@ public void setBearerTokenSecret(SecretKeySelector bearerTokenSecret) { this.bearerTokenSecret = bearerTokenSecret; } + @JsonProperty("fallbackScrapeProtocol") + public String getFallbackScrapeProtocol() { + return fallbackScrapeProtocol; + } + + @JsonProperty("fallbackScrapeProtocol") + public void setFallbackScrapeProtocol(String fallbackScrapeProtocol) { + this.fallbackScrapeProtocol = fallbackScrapeProtocol; + } + @JsonProperty("interval") public String getInterval() { return interval; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusSpec.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusSpec.java index bf56891c92..bb7d6526b3 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusSpec.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusSpec.java @@ -61,6 +61,7 @@ "dnsPolicy", "enableAdminAPI", "enableFeatures", + "enableOTLPReceiver", "enableRemoteWriteReceiver", "enforcedBodySizeLimit", "enforcedKeepDroppedTargets", @@ -91,6 +92,7 @@ "logLevel", "maximumStartupDurationSeconds", "minReadySeconds", + "nameValidationScheme", "nodeSelector", "otlp", "overrideHonorLabels", @@ -220,6 +222,8 @@ public class PrometheusSpec implements Editable, Kubernet @JsonProperty("enableFeatures") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List enableFeatures = new ArrayList<>(); + @JsonProperty("enableOTLPReceiver") + private Boolean enableOTLPReceiver; @JsonProperty("enableRemoteWriteReceiver") private Boolean enableRemoteWriteReceiver; @JsonProperty("enforcedBodySizeLimit") @@ -285,6 +289,8 @@ public class PrometheusSpec implements Editable, Kubernet private Integer maximumStartupDurationSeconds; @JsonProperty("minReadySeconds") private Long minReadySeconds; + @JsonProperty("nameValidationScheme") + private String nameValidationScheme; @JsonProperty("nodeSelector") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map nodeSelector = new LinkedHashMap<>(); @@ -430,7 +436,7 @@ public class PrometheusSpec implements Editable, Kubernet public PrometheusSpec() { } - public PrometheusSpec(SecretKeySelector additionalAlertManagerConfigs, SecretKeySelector additionalAlertRelabelConfigs, List additionalArgs, SecretKeySelector additionalScrapeConfigs, Affinity affinity, AlertingSpec alerting, Boolean allowOverlappingBlocks, APIServerConfig apiserverConfig, ArbitraryFSAccessThroughSMsConfig arbitraryFSAccessThroughSMs, Boolean automountServiceAccountToken, String baseImage, String bodySizeLimit, List configMaps, List containers, Boolean disableCompaction, PodDNSConfig dnsConfig, String dnsPolicy, Boolean enableAdminAPI, List enableFeatures, Boolean enableRemoteWriteReceiver, String enforcedBodySizeLimit, Long enforcedKeepDroppedTargets, Long enforcedLabelLimit, Long enforcedLabelNameLengthLimit, Long enforcedLabelValueLengthLimit, String enforcedNamespaceLabel, Long enforcedSampleLimit, Long enforcedTargetLimit, String evaluationInterval, List excludedFromEnforcement, Exemplars exemplars, Map externalLabels, String externalUrl, List hostAliases, Boolean hostNetwork, Boolean ignoreNamespaceSelectors, String image, String imagePullPolicy, List imagePullSecrets, List initContainers, Long keepDroppedTargets, Long labelLimit, Long labelNameLengthLimit, Long labelValueLengthLimit, Boolean listenLocal, String logFormat, String logLevel, Integer maximumStartupDurationSeconds, Long minReadySeconds, Map nodeSelector, OTLPConfig otlp, Boolean overrideHonorLabels, Boolean overrideHonorTimestamps, Boolean paused, StatefulSetPersistentVolumeClaimRetentionPolicy persistentVolumeClaimRetentionPolicy, EmbeddedObjectMetadata podMetadata, LabelSelector podMonitorNamespaceSelector, LabelSelector podMonitorSelector, List podTargetLabels, String portName, String priorityClassName, LabelSelector probeNamespaceSelector, LabelSelector probeSelector, String prometheusExternalLabelName, List prometheusRulesExcludedFromEnforce, QuerySpec query, String queryLogFile, String reloadStrategy, List remoteRead, List remoteWrite, List remoteWriteReceiverMessageVersions, String replicaExternalLabelName, Integer replicas, ResourceRequirements resources, String retention, String retentionSize, String routePrefix, LabelSelector ruleNamespaceSelector, String ruleQueryOffset, LabelSelector ruleSelector, Rules rules, RuntimeConfig runtime, Long sampleLimit, List scrapeClasses, LabelSelector scrapeConfigNamespaceSelector, LabelSelector scrapeConfigSelector, String scrapeInterval, List scrapeProtocols, String scrapeTimeout, List secrets, PodSecurityContext securityContext, String serviceAccountName, String serviceDiscoveryRole, LabelSelector serviceMonitorNamespaceSelector, LabelSelector serviceMonitorSelector, String sha, Integer shards, StorageSpec storage, String tag, Long targetLimit, ThanosSpec thanos, List tolerations, List topologySpreadConstraints, PrometheusTracingConfig tracingConfig, TSDBSpec tsdb, String version, List volumeMounts, List volumes, Boolean walCompression, PrometheusWebSpec web) { + public PrometheusSpec(SecretKeySelector additionalAlertManagerConfigs, SecretKeySelector additionalAlertRelabelConfigs, List additionalArgs, SecretKeySelector additionalScrapeConfigs, Affinity affinity, AlertingSpec alerting, Boolean allowOverlappingBlocks, APIServerConfig apiserverConfig, ArbitraryFSAccessThroughSMsConfig arbitraryFSAccessThroughSMs, Boolean automountServiceAccountToken, String baseImage, String bodySizeLimit, List configMaps, List containers, Boolean disableCompaction, PodDNSConfig dnsConfig, String dnsPolicy, Boolean enableAdminAPI, List enableFeatures, Boolean enableOTLPReceiver, Boolean enableRemoteWriteReceiver, String enforcedBodySizeLimit, Long enforcedKeepDroppedTargets, Long enforcedLabelLimit, Long enforcedLabelNameLengthLimit, Long enforcedLabelValueLengthLimit, String enforcedNamespaceLabel, Long enforcedSampleLimit, Long enforcedTargetLimit, String evaluationInterval, List excludedFromEnforcement, Exemplars exemplars, Map externalLabels, String externalUrl, List hostAliases, Boolean hostNetwork, Boolean ignoreNamespaceSelectors, String image, String imagePullPolicy, List imagePullSecrets, List initContainers, Long keepDroppedTargets, Long labelLimit, Long labelNameLengthLimit, Long labelValueLengthLimit, Boolean listenLocal, String logFormat, String logLevel, Integer maximumStartupDurationSeconds, Long minReadySeconds, String nameValidationScheme, Map nodeSelector, OTLPConfig otlp, Boolean overrideHonorLabels, Boolean overrideHonorTimestamps, Boolean paused, StatefulSetPersistentVolumeClaimRetentionPolicy persistentVolumeClaimRetentionPolicy, EmbeddedObjectMetadata podMetadata, LabelSelector podMonitorNamespaceSelector, LabelSelector podMonitorSelector, List podTargetLabels, String portName, String priorityClassName, LabelSelector probeNamespaceSelector, LabelSelector probeSelector, String prometheusExternalLabelName, List prometheusRulesExcludedFromEnforce, QuerySpec query, String queryLogFile, String reloadStrategy, List remoteRead, List remoteWrite, List remoteWriteReceiverMessageVersions, String replicaExternalLabelName, Integer replicas, ResourceRequirements resources, String retention, String retentionSize, String routePrefix, LabelSelector ruleNamespaceSelector, String ruleQueryOffset, LabelSelector ruleSelector, Rules rules, RuntimeConfig runtime, Long sampleLimit, List scrapeClasses, LabelSelector scrapeConfigNamespaceSelector, LabelSelector scrapeConfigSelector, String scrapeInterval, List scrapeProtocols, String scrapeTimeout, List secrets, PodSecurityContext securityContext, String serviceAccountName, String serviceDiscoveryRole, LabelSelector serviceMonitorNamespaceSelector, LabelSelector serviceMonitorSelector, String sha, Integer shards, StorageSpec storage, String tag, Long targetLimit, ThanosSpec thanos, List tolerations, List topologySpreadConstraints, PrometheusTracingConfig tracingConfig, TSDBSpec tsdb, String version, List volumeMounts, List volumes, Boolean walCompression, PrometheusWebSpec web) { super(); this.additionalAlertManagerConfigs = additionalAlertManagerConfigs; this.additionalAlertRelabelConfigs = additionalAlertRelabelConfigs; @@ -451,6 +457,7 @@ public PrometheusSpec(SecretKeySelector additionalAlertManagerConfigs, SecretKey this.dnsPolicy = dnsPolicy; this.enableAdminAPI = enableAdminAPI; this.enableFeatures = enableFeatures; + this.enableOTLPReceiver = enableOTLPReceiver; this.enableRemoteWriteReceiver = enableRemoteWriteReceiver; this.enforcedBodySizeLimit = enforcedBodySizeLimit; this.enforcedKeepDroppedTargets = enforcedKeepDroppedTargets; @@ -481,6 +488,7 @@ public PrometheusSpec(SecretKeySelector additionalAlertManagerConfigs, SecretKey this.logLevel = logLevel; this.maximumStartupDurationSeconds = maximumStartupDurationSeconds; this.minReadySeconds = minReadySeconds; + this.nameValidationScheme = nameValidationScheme; this.nodeSelector = nodeSelector; this.otlp = otlp; this.overrideHonorLabels = overrideHonorLabels; @@ -738,6 +746,16 @@ public void setEnableFeatures(List enableFeatures) { this.enableFeatures = enableFeatures; } + @JsonProperty("enableOTLPReceiver") + public Boolean getEnableOTLPReceiver() { + return enableOTLPReceiver; + } + + @JsonProperty("enableOTLPReceiver") + public void setEnableOTLPReceiver(Boolean enableOTLPReceiver) { + this.enableOTLPReceiver = enableOTLPReceiver; + } + @JsonProperty("enableRemoteWriteReceiver") public Boolean getEnableRemoteWriteReceiver() { return enableRemoteWriteReceiver; @@ -1043,6 +1061,16 @@ public void setMinReadySeconds(Long minReadySeconds) { this.minReadySeconds = minReadySeconds; } + @JsonProperty("nameValidationScheme") + public String getNameValidationScheme() { + return nameValidationScheme; + } + + @JsonProperty("nameValidationScheme") + public void setNameValidationScheme(String nameValidationScheme) { + this.nameValidationScheme = nameValidationScheme; + } + @JsonProperty("nodeSelector") @JsonInclude(JsonInclude.Include.NON_EMPTY) public Map getNodeSelector() { diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/RuleGroup.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/RuleGroup.java index 5b5097be12..f4bcfd4df0 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/RuleGroup.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/RuleGroup.java @@ -38,6 +38,7 @@ @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ "interval", + "labels", "limit", "name", "partial_response_strategy", @@ -71,6 +72,9 @@ public class RuleGroup implements Editable, KubernetesResource @JsonProperty("interval") private String interval; + @JsonProperty("labels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map labels = new LinkedHashMap<>(); @JsonProperty("limit") private Integer limit; @JsonProperty("name") @@ -92,9 +96,10 @@ public class RuleGroup implements Editable, KubernetesResource public RuleGroup() { } - public RuleGroup(String interval, Integer limit, String name, String partialResponseStrategy, String queryOffset, List rules) { + public RuleGroup(String interval, Map labels, Integer limit, String name, String partialResponseStrategy, String queryOffset, List rules) { super(); this.interval = interval; + this.labels = labels; this.limit = limit; this.name = name; this.partialResponseStrategy = partialResponseStrategy; @@ -112,6 +117,17 @@ public void setInterval(String interval) { this.interval = interval; } + @JsonProperty("labels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getLabels() { + return labels; + } + + @JsonProperty("labels") + public void setLabels(Map labels) { + this.labels = labels; + } + @JsonProperty("limit") public Integer getLimit() { return limit; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ScrapeClass.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ScrapeClass.java index 67f6e347e7..717dba75f8 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ScrapeClass.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ScrapeClass.java @@ -38,6 +38,7 @@ @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ "attachMetadata", + "authorization", "default", "metricRelabelings", "name", @@ -71,6 +72,8 @@ public class ScrapeClass implements Editable, KubernetesReso @JsonProperty("attachMetadata") private AttachMetadata attachMetadata; + @JsonProperty("authorization") + private Authorization authorization; @JsonProperty("default") private Boolean _default; @JsonProperty("metricRelabelings") @@ -93,9 +96,10 @@ public class ScrapeClass implements Editable, KubernetesReso public ScrapeClass() { } - public ScrapeClass(AttachMetadata attachMetadata, Boolean _default, List metricRelabelings, String name, List relabelings, TLSConfig tlsConfig) { + public ScrapeClass(AttachMetadata attachMetadata, Authorization authorization, Boolean _default, List metricRelabelings, String name, List relabelings, TLSConfig tlsConfig) { super(); this.attachMetadata = attachMetadata; + this.authorization = authorization; this._default = _default; this.metricRelabelings = metricRelabelings; this.name = name; @@ -113,6 +117,16 @@ public void setAttachMetadata(AttachMetadata attachMetadata) { this.attachMetadata = attachMetadata; } + @JsonProperty("authorization") + public Authorization getAuthorization() { + return authorization; + } + + @JsonProperty("authorization") + public void setAuthorization(Authorization authorization) { + this.authorization = authorization; + } + @JsonProperty("default") public Boolean getDefault() { return _default; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ServiceMonitorSpec.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ServiceMonitorSpec.java index ce91981c6d..85cda47bea 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ServiceMonitorSpec.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ServiceMonitorSpec.java @@ -41,6 +41,7 @@ "attachMetadata", "bodySizeLimit", "endpoints", + "fallbackScrapeProtocol", "jobLabel", "keepDroppedTargets", "labelLimit", @@ -55,6 +56,7 @@ "scrapeClassicHistograms", "scrapeProtocols", "selector", + "selectorMechanism", "targetLabels", "targetLimit" }) @@ -90,6 +92,8 @@ public class ServiceMonitorSpec implements Editable, @JsonProperty("endpoints") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List endpoints = new ArrayList<>(); + @JsonProperty("fallbackScrapeProtocol") + private String fallbackScrapeProtocol; @JsonProperty("jobLabel") private String jobLabel; @JsonProperty("keepDroppedTargets") @@ -120,6 +124,8 @@ public class ServiceMonitorSpec implements Editable, private List scrapeProtocols = new ArrayList<>(); @JsonProperty("selector") private LabelSelector selector; + @JsonProperty("selectorMechanism") + private String selectorMechanism; @JsonProperty("targetLabels") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List targetLabels = new ArrayList<>(); @@ -135,11 +141,12 @@ public class ServiceMonitorSpec implements Editable, public ServiceMonitorSpec() { } - public ServiceMonitorSpec(AttachMetadata attachMetadata, String bodySizeLimit, List endpoints, String jobLabel, Long keepDroppedTargets, Long labelLimit, Long labelNameLengthLimit, Long labelValueLengthLimit, NamespaceSelector namespaceSelector, Long nativeHistogramBucketLimit, Quantity nativeHistogramMinBucketFactor, List podTargetLabels, Long sampleLimit, String scrapeClass, Boolean scrapeClassicHistograms, List scrapeProtocols, LabelSelector selector, List targetLabels, Long targetLimit) { + public ServiceMonitorSpec(AttachMetadata attachMetadata, String bodySizeLimit, List endpoints, String fallbackScrapeProtocol, String jobLabel, Long keepDroppedTargets, Long labelLimit, Long labelNameLengthLimit, Long labelValueLengthLimit, NamespaceSelector namespaceSelector, Long nativeHistogramBucketLimit, Quantity nativeHistogramMinBucketFactor, List podTargetLabels, Long sampleLimit, String scrapeClass, Boolean scrapeClassicHistograms, List scrapeProtocols, LabelSelector selector, String selectorMechanism, List targetLabels, Long targetLimit) { super(); this.attachMetadata = attachMetadata; this.bodySizeLimit = bodySizeLimit; this.endpoints = endpoints; + this.fallbackScrapeProtocol = fallbackScrapeProtocol; this.jobLabel = jobLabel; this.keepDroppedTargets = keepDroppedTargets; this.labelLimit = labelLimit; @@ -154,6 +161,7 @@ public ServiceMonitorSpec(AttachMetadata attachMetadata, String bodySizeLimit, L this.scrapeClassicHistograms = scrapeClassicHistograms; this.scrapeProtocols = scrapeProtocols; this.selector = selector; + this.selectorMechanism = selectorMechanism; this.targetLabels = targetLabels; this.targetLimit = targetLimit; } @@ -189,6 +197,16 @@ public void setEndpoints(List endpoints) { this.endpoints = endpoints; } + @JsonProperty("fallbackScrapeProtocol") + public String getFallbackScrapeProtocol() { + return fallbackScrapeProtocol; + } + + @JsonProperty("fallbackScrapeProtocol") + public void setFallbackScrapeProtocol(String fallbackScrapeProtocol) { + this.fallbackScrapeProtocol = fallbackScrapeProtocol; + } + @JsonProperty("jobLabel") public String getJobLabel() { return jobLabel; @@ -331,6 +349,16 @@ public void setSelector(LabelSelector selector) { this.selector = selector; } + @JsonProperty("selectorMechanism") + public String getSelectorMechanism() { + return selectorMechanism; + } + + @JsonProperty("selectorMechanism") + public void setSelectorMechanism(String selectorMechanism) { + this.selectorMechanism = selectorMechanism; + } + @JsonProperty("targetLabels") @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getTargetLabels() { diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/ConsulSDConfig.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/ConsulSDConfig.java index 14486df58a..321a847871 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/ConsulSDConfig.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/ConsulSDConfig.java @@ -47,12 +47,14 @@ "basicAuth", "datacenter", "enableHTTP2", + "filter", "followRedirects", "namespace", "noProxy", "nodeMeta", "oauth2", "partition", + "pathPrefix", "proxyConnectHeader", "proxyFromEnvironment", "proxyUrl", @@ -100,6 +102,8 @@ public class ConsulSDConfig implements Editable, Kubernet private String datacenter; @JsonProperty("enableHTTP2") private Boolean enableHTTP2; + @JsonProperty("filter") + private String filter; @JsonProperty("followRedirects") private Boolean followRedirects; @JsonProperty("namespace") @@ -113,6 +117,8 @@ public class ConsulSDConfig implements Editable, Kubernet private OAuth2 oauth2; @JsonProperty("partition") private String partition; + @JsonProperty("pathPrefix") + private String pathPrefix; @JsonProperty("proxyConnectHeader") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map> proxyConnectHeader = new LinkedHashMap<>(); @@ -148,19 +154,21 @@ public class ConsulSDConfig implements Editable, Kubernet public ConsulSDConfig() { } - public ConsulSDConfig(Boolean allowStale, SafeAuthorization authorization, BasicAuth basicAuth, String datacenter, Boolean enableHTTP2, Boolean followRedirects, String namespace, String noProxy, Map nodeMeta, OAuth2 oauth2, String partition, Map> proxyConnectHeader, Boolean proxyFromEnvironment, String proxyUrl, String refreshInterval, String scheme, String server, List services, String tagSeparator, List tags, SafeTLSConfig tlsConfig, SecretKeySelector tokenRef) { + public ConsulSDConfig(Boolean allowStale, SafeAuthorization authorization, BasicAuth basicAuth, String datacenter, Boolean enableHTTP2, String filter, Boolean followRedirects, String namespace, String noProxy, Map nodeMeta, OAuth2 oauth2, String partition, String pathPrefix, Map> proxyConnectHeader, Boolean proxyFromEnvironment, String proxyUrl, String refreshInterval, String scheme, String server, List services, String tagSeparator, List tags, SafeTLSConfig tlsConfig, SecretKeySelector tokenRef) { super(); this.allowStale = allowStale; this.authorization = authorization; this.basicAuth = basicAuth; this.datacenter = datacenter; this.enableHTTP2 = enableHTTP2; + this.filter = filter; this.followRedirects = followRedirects; this.namespace = namespace; this.noProxy = noProxy; this.nodeMeta = nodeMeta; this.oauth2 = oauth2; this.partition = partition; + this.pathPrefix = pathPrefix; this.proxyConnectHeader = proxyConnectHeader; this.proxyFromEnvironment = proxyFromEnvironment; this.proxyUrl = proxyUrl; @@ -224,6 +232,16 @@ public void setEnableHTTP2(Boolean enableHTTP2) { this.enableHTTP2 = enableHTTP2; } + @JsonProperty("filter") + public String getFilter() { + return filter; + } + + @JsonProperty("filter") + public void setFilter(String filter) { + this.filter = filter; + } + @JsonProperty("followRedirects") public Boolean getFollowRedirects() { return followRedirects; @@ -285,6 +303,16 @@ public void setPartition(String partition) { this.partition = partition; } + @JsonProperty("pathPrefix") + public String getPathPrefix() { + return pathPrefix; + } + + @JsonProperty("pathPrefix") + public void setPathPrefix(String pathPrefix) { + this.pathPrefix = pathPrefix; + } + @JsonProperty("proxyConnectHeader") @JsonInclude(JsonInclude.Include.NON_EMPTY) public Map> getProxyConnectHeader() { diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/PrometheusAgentSpec.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/PrometheusAgentSpec.java index 85f3e4e14c..1df216882d 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/PrometheusAgentSpec.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/PrometheusAgentSpec.java @@ -43,6 +43,7 @@ import io.fabric8.openshift.api.model.monitoring.v1.PrometheusTracingConfig; import io.fabric8.openshift.api.model.monitoring.v1.PrometheusWebSpec; import io.fabric8.openshift.api.model.monitoring.v1.RemoteWriteSpec; +import io.fabric8.openshift.api.model.monitoring.v1.RuntimeConfig; import io.fabric8.openshift.api.model.monitoring.v1.ScrapeClass; import io.fabric8.openshift.api.model.monitoring.v1.StorageSpec; import io.fabric8.openshift.api.model.monitoring.v1.TSDBSpec; @@ -68,6 +69,7 @@ "dnsConfig", "dnsPolicy", "enableFeatures", + "enableOTLPReceiver", "enableRemoteWriteReceiver", "enforcedBodySizeLimit", "enforcedKeepDroppedTargets", @@ -97,6 +99,7 @@ "maximumStartupDurationSeconds", "minReadySeconds", "mode", + "nameValidationScheme", "nodeSelector", "otlp", "overrideHonorLabels", @@ -119,6 +122,7 @@ "replicas", "resources", "routePrefix", + "runtime", "sampleLimit", "scrapeClasses", "scrapeConfigNamespaceSelector", @@ -198,6 +202,8 @@ public class PrometheusAgentSpec implements Editable @JsonProperty("enableFeatures") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List enableFeatures = new ArrayList<>(); + @JsonProperty("enableOTLPReceiver") + private Boolean enableOTLPReceiver; @JsonProperty("enableRemoteWriteReceiver") private Boolean enableRemoteWriteReceiver; @JsonProperty("enforcedBodySizeLimit") @@ -261,6 +267,8 @@ public class PrometheusAgentSpec implements Editable private Long minReadySeconds; @JsonProperty("mode") private String mode; + @JsonProperty("nameValidationScheme") + private String nameValidationScheme; @JsonProperty("nodeSelector") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map nodeSelector = new LinkedHashMap<>(); @@ -309,6 +317,8 @@ public class PrometheusAgentSpec implements Editable private ResourceRequirements resources; @JsonProperty("routePrefix") private String routePrefix; + @JsonProperty("runtime") + private RuntimeConfig runtime; @JsonProperty("sampleLimit") private Long sampleLimit; @JsonProperty("scrapeClasses") @@ -376,7 +386,7 @@ public class PrometheusAgentSpec implements Editable public PrometheusAgentSpec() { } - public PrometheusAgentSpec(List additionalArgs, SecretKeySelector additionalScrapeConfigs, Affinity affinity, APIServerConfig apiserverConfig, ArbitraryFSAccessThroughSMsConfig arbitraryFSAccessThroughSMs, Boolean automountServiceAccountToken, String bodySizeLimit, List configMaps, List containers, PodDNSConfig dnsConfig, String dnsPolicy, List enableFeatures, Boolean enableRemoteWriteReceiver, String enforcedBodySizeLimit, Long enforcedKeepDroppedTargets, Long enforcedLabelLimit, Long enforcedLabelNameLengthLimit, Long enforcedLabelValueLengthLimit, String enforcedNamespaceLabel, Long enforcedSampleLimit, Long enforcedTargetLimit, List excludedFromEnforcement, Map externalLabels, String externalUrl, List hostAliases, Boolean hostNetwork, Boolean ignoreNamespaceSelectors, String image, String imagePullPolicy, List imagePullSecrets, List initContainers, Long keepDroppedTargets, Long labelLimit, Long labelNameLengthLimit, Long labelValueLengthLimit, Boolean listenLocal, String logFormat, String logLevel, Integer maximumStartupDurationSeconds, Long minReadySeconds, String mode, Map nodeSelector, OTLPConfig otlp, Boolean overrideHonorLabels, Boolean overrideHonorTimestamps, Boolean paused, StatefulSetPersistentVolumeClaimRetentionPolicy persistentVolumeClaimRetentionPolicy, EmbeddedObjectMetadata podMetadata, LabelSelector podMonitorNamespaceSelector, LabelSelector podMonitorSelector, List podTargetLabels, String portName, String priorityClassName, LabelSelector probeNamespaceSelector, LabelSelector probeSelector, String prometheusExternalLabelName, String reloadStrategy, List remoteWrite, List remoteWriteReceiverMessageVersions, String replicaExternalLabelName, Integer replicas, ResourceRequirements resources, String routePrefix, Long sampleLimit, List scrapeClasses, LabelSelector scrapeConfigNamespaceSelector, LabelSelector scrapeConfigSelector, String scrapeInterval, List scrapeProtocols, String scrapeTimeout, List secrets, PodSecurityContext securityContext, String serviceAccountName, String serviceDiscoveryRole, LabelSelector serviceMonitorNamespaceSelector, LabelSelector serviceMonitorSelector, Integer shards, StorageSpec storage, Long targetLimit, List tolerations, List topologySpreadConstraints, PrometheusTracingConfig tracingConfig, TSDBSpec tsdb, String version, List volumeMounts, List volumes, Boolean walCompression, PrometheusWebSpec web) { + public PrometheusAgentSpec(List additionalArgs, SecretKeySelector additionalScrapeConfigs, Affinity affinity, APIServerConfig apiserverConfig, ArbitraryFSAccessThroughSMsConfig arbitraryFSAccessThroughSMs, Boolean automountServiceAccountToken, String bodySizeLimit, List configMaps, List containers, PodDNSConfig dnsConfig, String dnsPolicy, List enableFeatures, Boolean enableOTLPReceiver, Boolean enableRemoteWriteReceiver, String enforcedBodySizeLimit, Long enforcedKeepDroppedTargets, Long enforcedLabelLimit, Long enforcedLabelNameLengthLimit, Long enforcedLabelValueLengthLimit, String enforcedNamespaceLabel, Long enforcedSampleLimit, Long enforcedTargetLimit, List excludedFromEnforcement, Map externalLabels, String externalUrl, List hostAliases, Boolean hostNetwork, Boolean ignoreNamespaceSelectors, String image, String imagePullPolicy, List imagePullSecrets, List initContainers, Long keepDroppedTargets, Long labelLimit, Long labelNameLengthLimit, Long labelValueLengthLimit, Boolean listenLocal, String logFormat, String logLevel, Integer maximumStartupDurationSeconds, Long minReadySeconds, String mode, String nameValidationScheme, Map nodeSelector, OTLPConfig otlp, Boolean overrideHonorLabels, Boolean overrideHonorTimestamps, Boolean paused, StatefulSetPersistentVolumeClaimRetentionPolicy persistentVolumeClaimRetentionPolicy, EmbeddedObjectMetadata podMetadata, LabelSelector podMonitorNamespaceSelector, LabelSelector podMonitorSelector, List podTargetLabels, String portName, String priorityClassName, LabelSelector probeNamespaceSelector, LabelSelector probeSelector, String prometheusExternalLabelName, String reloadStrategy, List remoteWrite, List remoteWriteReceiverMessageVersions, String replicaExternalLabelName, Integer replicas, ResourceRequirements resources, String routePrefix, RuntimeConfig runtime, Long sampleLimit, List scrapeClasses, LabelSelector scrapeConfigNamespaceSelector, LabelSelector scrapeConfigSelector, String scrapeInterval, List scrapeProtocols, String scrapeTimeout, List secrets, PodSecurityContext securityContext, String serviceAccountName, String serviceDiscoveryRole, LabelSelector serviceMonitorNamespaceSelector, LabelSelector serviceMonitorSelector, Integer shards, StorageSpec storage, Long targetLimit, List tolerations, List topologySpreadConstraints, PrometheusTracingConfig tracingConfig, TSDBSpec tsdb, String version, List volumeMounts, List volumes, Boolean walCompression, PrometheusWebSpec web) { super(); this.additionalArgs = additionalArgs; this.additionalScrapeConfigs = additionalScrapeConfigs; @@ -390,6 +400,7 @@ public PrometheusAgentSpec(List additionalArgs, SecretKeySelector addi this.dnsConfig = dnsConfig; this.dnsPolicy = dnsPolicy; this.enableFeatures = enableFeatures; + this.enableOTLPReceiver = enableOTLPReceiver; this.enableRemoteWriteReceiver = enableRemoteWriteReceiver; this.enforcedBodySizeLimit = enforcedBodySizeLimit; this.enforcedKeepDroppedTargets = enforcedKeepDroppedTargets; @@ -419,6 +430,7 @@ public PrometheusAgentSpec(List additionalArgs, SecretKeySelector addi this.maximumStartupDurationSeconds = maximumStartupDurationSeconds; this.minReadySeconds = minReadySeconds; this.mode = mode; + this.nameValidationScheme = nameValidationScheme; this.nodeSelector = nodeSelector; this.otlp = otlp; this.overrideHonorLabels = overrideHonorLabels; @@ -441,6 +453,7 @@ public PrometheusAgentSpec(List additionalArgs, SecretKeySelector addi this.replicas = replicas; this.resources = resources; this.routePrefix = routePrefix; + this.runtime = runtime; this.sampleLimit = sampleLimit; this.scrapeClasses = scrapeClasses; this.scrapeConfigNamespaceSelector = scrapeConfigNamespaceSelector; @@ -592,6 +605,16 @@ public void setEnableFeatures(List enableFeatures) { this.enableFeatures = enableFeatures; } + @JsonProperty("enableOTLPReceiver") + public Boolean getEnableOTLPReceiver() { + return enableOTLPReceiver; + } + + @JsonProperty("enableOTLPReceiver") + public void setEnableOTLPReceiver(Boolean enableOTLPReceiver) { + this.enableOTLPReceiver = enableOTLPReceiver; + } + @JsonProperty("enableRemoteWriteReceiver") public Boolean getEnableRemoteWriteReceiver() { return enableRemoteWriteReceiver; @@ -887,6 +910,16 @@ public void setMode(String mode) { this.mode = mode; } + @JsonProperty("nameValidationScheme") + public String getNameValidationScheme() { + return nameValidationScheme; + } + + @JsonProperty("nameValidationScheme") + public void setNameValidationScheme(String nameValidationScheme) { + this.nameValidationScheme = nameValidationScheme; + } + @JsonProperty("nodeSelector") @JsonInclude(JsonInclude.Include.NON_EMPTY) public Map getNodeSelector() { @@ -1111,6 +1144,16 @@ public void setRoutePrefix(String routePrefix) { this.routePrefix = routePrefix; } + @JsonProperty("runtime") + public RuntimeConfig getRuntime() { + return runtime; + } + + @JsonProperty("runtime") + public void setRuntime(RuntimeConfig runtime) { + this.runtime = runtime; + } + @JsonProperty("sampleLimit") public Long getSampleLimit() { return sampleLimit; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/ScrapeConfigSpec.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/ScrapeConfigSpec.java index 9af4e83d01..875383f695 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/ScrapeConfigSpec.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/ScrapeConfigSpec.java @@ -54,7 +54,9 @@ "dockerSwarmSDConfigs", "ec2SDConfigs", "enableCompression", + "enableHTTP2", "eurekaSDConfigs", + "fallbackScrapeProtocol", "fileSDConfigs", "gceSDConfigs", "hetznerSDConfigs", @@ -151,9 +153,13 @@ public class ScrapeConfigSpec implements Editable, Kube private List ec2SDConfigs = new ArrayList<>(); @JsonProperty("enableCompression") private Boolean enableCompression; + @JsonProperty("enableHTTP2") + private Boolean enableHTTP2; @JsonProperty("eurekaSDConfigs") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List eurekaSDConfigs = new ArrayList<>(); + @JsonProperty("fallbackScrapeProtocol") + private String fallbackScrapeProtocol; @JsonProperty("fileSDConfigs") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List fileSDConfigs = new ArrayList<>(); @@ -270,7 +276,7 @@ public class ScrapeConfigSpec implements Editable, Kube public ScrapeConfigSpec() { } - public ScrapeConfigSpec(SafeAuthorization authorization, List azureSDConfigs, BasicAuth basicAuth, List consulSDConfigs, List digitalOceanSDConfigs, List dnsSDConfigs, List dockerSDConfigs, List dockerSwarmSDConfigs, List ec2SDConfigs, Boolean enableCompression, List eurekaSDConfigs, List fileSDConfigs, List gceSDConfigs, List hetznerSDConfigs, Boolean honorLabels, Boolean honorTimestamps, List httpSDConfigs, List ionosSDConfigs, String jobName, Long keepDroppedTargets, List kubernetesSDConfigs, List kumaSDConfigs, Long labelLimit, Long labelNameLengthLimit, Long labelValueLengthLimit, List lightSailSDConfigs, List linodeSDConfigs, List metricRelabelings, String metricsPath, Long nativeHistogramBucketLimit, Quantity nativeHistogramMinBucketFactor, String noProxy, List nomadSDConfigs, OAuth2 oauth2, List openstackSDConfigs, List ovhcloudSDConfigs, Map> params, Map> proxyConnectHeader, Boolean proxyFromEnvironment, String proxyUrl, List puppetDBSDConfigs, List relabelings, Long sampleLimit, List scalewaySDConfigs, String scheme, String scrapeClass, Boolean scrapeClassicHistograms, String scrapeInterval, List scrapeProtocols, String scrapeTimeout, List staticConfigs, Long targetLimit, SafeTLSConfig tlsConfig, Boolean trackTimestampsStaleness) { + public ScrapeConfigSpec(SafeAuthorization authorization, List azureSDConfigs, BasicAuth basicAuth, List consulSDConfigs, List digitalOceanSDConfigs, List dnsSDConfigs, List dockerSDConfigs, List dockerSwarmSDConfigs, List ec2SDConfigs, Boolean enableCompression, Boolean enableHTTP2, List eurekaSDConfigs, String fallbackScrapeProtocol, List fileSDConfigs, List gceSDConfigs, List hetznerSDConfigs, Boolean honorLabels, Boolean honorTimestamps, List httpSDConfigs, List ionosSDConfigs, String jobName, Long keepDroppedTargets, List kubernetesSDConfigs, List kumaSDConfigs, Long labelLimit, Long labelNameLengthLimit, Long labelValueLengthLimit, List lightSailSDConfigs, List linodeSDConfigs, List metricRelabelings, String metricsPath, Long nativeHistogramBucketLimit, Quantity nativeHistogramMinBucketFactor, String noProxy, List nomadSDConfigs, OAuth2 oauth2, List openstackSDConfigs, List ovhcloudSDConfigs, Map> params, Map> proxyConnectHeader, Boolean proxyFromEnvironment, String proxyUrl, List puppetDBSDConfigs, List relabelings, Long sampleLimit, List scalewaySDConfigs, String scheme, String scrapeClass, Boolean scrapeClassicHistograms, String scrapeInterval, List scrapeProtocols, String scrapeTimeout, List staticConfigs, Long targetLimit, SafeTLSConfig tlsConfig, Boolean trackTimestampsStaleness) { super(); this.authorization = authorization; this.azureSDConfigs = azureSDConfigs; @@ -282,7 +288,9 @@ public ScrapeConfigSpec(SafeAuthorization authorization, List azu this.dockerSwarmSDConfigs = dockerSwarmSDConfigs; this.ec2SDConfigs = ec2SDConfigs; this.enableCompression = enableCompression; + this.enableHTTP2 = enableHTTP2; this.eurekaSDConfigs = eurekaSDConfigs; + this.fallbackScrapeProtocol = fallbackScrapeProtocol; this.fileSDConfigs = fileSDConfigs; this.gceSDConfigs = gceSDConfigs; this.hetznerSDConfigs = hetznerSDConfigs; @@ -435,6 +443,16 @@ public void setEnableCompression(Boolean enableCompression) { this.enableCompression = enableCompression; } + @JsonProperty("enableHTTP2") + public Boolean getEnableHTTP2() { + return enableHTTP2; + } + + @JsonProperty("enableHTTP2") + public void setEnableHTTP2(Boolean enableHTTP2) { + this.enableHTTP2 = enableHTTP2; + } + @JsonProperty("eurekaSDConfigs") @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getEurekaSDConfigs() { @@ -446,6 +464,16 @@ public void setEurekaSDConfigs(List eurekaSDConfigs) { this.eurekaSDConfigs = eurekaSDConfigs; } + @JsonProperty("fallbackScrapeProtocol") + public String getFallbackScrapeProtocol() { + return fallbackScrapeProtocol; + } + + @JsonProperty("fallbackScrapeProtocol") + public void setFallbackScrapeProtocol(String fallbackScrapeProtocol) { + this.fallbackScrapeProtocol = fallbackScrapeProtocol; + } + @JsonProperty("fileSDConfigs") @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getFileSDConfigs() { diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/TelegramConfig.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/TelegramConfig.java index c690265519..87ea71e015 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/TelegramConfig.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/TelegramConfig.java @@ -43,6 +43,7 @@ "disableNotifications", "httpConfig", "message", + "messageThreadID", "parseMode", "sendResolved" }) @@ -85,6 +86,8 @@ public class TelegramConfig implements Editable, Kubernet private HTTPConfig httpConfig; @JsonProperty("message") private String message; + @JsonProperty("messageThreadID") + private Long messageThreadID; @JsonProperty("parseMode") private String parseMode; @JsonProperty("sendResolved") @@ -99,7 +102,7 @@ public class TelegramConfig implements Editable, Kubernet public TelegramConfig() { } - public TelegramConfig(String apiURL, SecretKeySelector botToken, String botTokenFile, Long chatID, Boolean disableNotifications, HTTPConfig httpConfig, String message, String parseMode, Boolean sendResolved) { + public TelegramConfig(String apiURL, SecretKeySelector botToken, String botTokenFile, Long chatID, Boolean disableNotifications, HTTPConfig httpConfig, String message, Long messageThreadID, String parseMode, Boolean sendResolved) { super(); this.apiURL = apiURL; this.botToken = botToken; @@ -108,6 +111,7 @@ public TelegramConfig(String apiURL, SecretKeySelector botToken, String botToken this.disableNotifications = disableNotifications; this.httpConfig = httpConfig; this.message = message; + this.messageThreadID = messageThreadID; this.parseMode = parseMode; this.sendResolved = sendResolved; } @@ -182,6 +186,16 @@ public void setMessage(String message) { this.message = message; } + @JsonProperty("messageThreadID") + public Long getMessageThreadID() { + return messageThreadID; + } + + @JsonProperty("messageThreadID") + public void setMessageThreadID(Long messageThreadID) { + this.messageThreadID = messageThreadID; + } + @JsonProperty("parseMode") public String getParseMode() { return parseMode; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1beta1/TelegramConfig.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1beta1/TelegramConfig.java index 2cdddb3568..7f214fe4d4 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1beta1/TelegramConfig.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1beta1/TelegramConfig.java @@ -42,6 +42,7 @@ "disableNotifications", "httpConfig", "message", + "messageThreadID", "parseMode", "sendResolved" }) @@ -84,6 +85,8 @@ public class TelegramConfig implements Editable, Kubernet private HTTPConfig httpConfig; @JsonProperty("message") private String message; + @JsonProperty("messageThreadID") + private Long messageThreadID; @JsonProperty("parseMode") private String parseMode; @JsonProperty("sendResolved") @@ -98,7 +101,7 @@ public class TelegramConfig implements Editable, Kubernet public TelegramConfig() { } - public TelegramConfig(String apiURL, SecretKeySelector botToken, String botTokenFile, Long chatID, Boolean disableNotifications, HTTPConfig httpConfig, String message, String parseMode, Boolean sendResolved) { + public TelegramConfig(String apiURL, SecretKeySelector botToken, String botTokenFile, Long chatID, Boolean disableNotifications, HTTPConfig httpConfig, String message, Long messageThreadID, String parseMode, Boolean sendResolved) { super(); this.apiURL = apiURL; this.botToken = botToken; @@ -107,6 +110,7 @@ public TelegramConfig(String apiURL, SecretKeySelector botToken, String botToken this.disableNotifications = disableNotifications; this.httpConfig = httpConfig; this.message = message; + this.messageThreadID = messageThreadID; this.parseMode = parseMode; this.sendResolved = sendResolved; } @@ -181,6 +185,16 @@ public void setMessage(String message) { this.message = message; } + @JsonProperty("messageThreadID") + public Long getMessageThreadID() { + return messageThreadID; + } + + @JsonProperty("messageThreadID") + public void setMessageThreadID(Long messageThreadID) { + this.messageThreadID = messageThreadID; + } + @JsonProperty("parseMode") public String getParseMode() { return parseMode;