Skip to content
Snippets Groups Projects
Unverified Commit 5f13edd1 authored by Damien Grisonnet's avatar Damien Grisonnet Committed by GitHub
Browse files

Merge pull request #1279 from prometheus-operator/automated-updates 

[bot] Automated version update
parents 93d6101b 05c72f83
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
jsonnetfile.lock.json
+ 12
− 12
View file @ 5f13edd1
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
"subdir": "contrib/mixin" "subdir": "contrib/mixin"
} }
}, },
"version": "a1fd98c6b0c4c5bc9e36ac45154e6a44d4c31bcb", "version": "53d234f1fe2b4212bd8538cd694db8fedc375549",
"sum": "PPTfil9MoAqtyW+hHJuAj3Ap86pB86vIHativ9R5c4I=" "sum": "PPTfil9MoAqtyW+hHJuAj3Ap86pB86vIHativ9R5c4I="
}, },
{ {
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
"subdir": "grafana-builder" "subdir": "grafana-builder"
} }
}, },
"version": "2a6bdb7df17539b27869bab8b04eab0cc69a7abb", "version": "a20c679492aae363414dce23bc63da09cf8a7287",
"sum": "GRf2GvwEU4jhXV+JOonXSZ4wdDv8mnHBPCQ6TUVd+g8=" "sum": "GRf2GvwEU4jhXV+JOonXSZ4wdDv8mnHBPCQ6TUVd+g8="
}, },
{ {
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
"subdir": "jsonnet/kube-state-metrics" "subdir": "jsonnet/kube-state-metrics"
} }
}, },
"version": "1d61fc146160a94ad6b932b9fc5124bc43a5e00c", "version": "58869f0c5e2e099e712b9c2c2123402ed90abc0b",
"sum": "S5qI+PJUdNeYOv76jH5nxwYS9N6U7CRxvyuB1wI4cTE=" "sum": "S5qI+PJUdNeYOv76jH5nxwYS9N6U7CRxvyuB1wI4cTE="
}, },
{ {
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin" "subdir": "jsonnet/kube-state-metrics-mixin"
} }
}, },
"version": "1d61fc146160a94ad6b932b9fc5124bc43a5e00c", "version": "58869f0c5e2e099e712b9c2c2123402ed90abc0b",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk=" "sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
}, },
{ {
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
"subdir": "jsonnet/mixin" "subdir": "jsonnet/mixin"
} }
}, },
"version": "1a0708426f2cb2d6613ea66b5ce2a4e166917539", "version": "3f047bc9c74105ba774aff726798a66b81409f7f",
"sum": "6reUygVmQrLEWQzTKcH8ceDbvM+2ztK3z2VBR2K2l+U=", "sum": "6reUygVmQrLEWQzTKcH8ceDbvM+2ztK3z2VBR2K2l+U=",
"name": "prometheus-operator-mixin" "name": "prometheus-operator-mixin"
}, },
...@@ -99,8 +99,8 @@ ...@@ -99,8 +99,8 @@
"subdir": "jsonnet/prometheus-operator" "subdir": "jsonnet/prometheus-operator"
} }
}, },
"version": "1a0708426f2cb2d6613ea66b5ce2a4e166917539", "version": "3f047bc9c74105ba774aff726798a66b81409f7f",
"sum": "r10jPrynhhJrBBh++pWad5ebvBiLhecjwmv4FN5imxQ=" "sum": "TcXPVhn0BIFCf5mWa6hyIljVl13ItwPjyeiwro56kjE="
}, },
{ {
"source": { "source": {
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
"subdir": "doc/alertmanager-mixin" "subdir": "doc/alertmanager-mixin"
} }
}, },
"version": "8491f816296b26bd4efe3aa4164fe72a7cd329de", "version": "3d86bd709df88e2b95a09636cf36b77a9d79af51",
"sum": "pep+dHzfIjh2SU5pEkwilMCAT/NoL6YYflV4x8cr7vU=", "sum": "pep+dHzfIjh2SU5pEkwilMCAT/NoL6YYflV4x8cr7vU=",
"name": "alertmanager" "name": "alertmanager"
}, },
...@@ -120,8 +120,8 @@ ...@@ -120,8 +120,8 @@
"subdir": "docs/node-mixin" "subdir": "docs/node-mixin"
} }
}, },
"version": "12968948aec1e2b216a2ecefc45cf3a50671aecb", "version": "129b5f5b5f4b8d2427df1790cef380e52669325b",
"sum": "aNKe0IYZwwYJSixqP5VMQpKZnquGKHHkYT0lIo3pmWM=" "sum": "r1ZfMhHo+ijlUkaD7fHrELSofWteq6exirgW/aMpnmE="
}, },
{ {
"source": { "source": {
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
"subdir": "documentation/prometheus-mixin" "subdir": "documentation/prometheus-mixin"
} }
}, },
"version": "a1c1313b3c86b1d50a2f099f4f2697ccb01388e4", "version": "79d354ad2e7c3d510a7811176d5ffcd1b29c8b77",
"sum": "G3mFWvwIrrhG6hlPz/hQdE6ZNSim88DlbSDJN7enkhY=", "sum": "G3mFWvwIrrhG6hlPz/hQdE6ZNSim88DlbSDJN7enkhY=",
"name": "prometheus" "name": "prometheus"
}, },
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
"subdir": "mixin" "subdir": "mixin"
} }
}, },
"version": "731a5ae9da195c37bc2eb18257ffbf4bd72238c1", "version": "0f5223beb7e9cb7e62f0227bf5649deb851e6112",
"sum": "cajthvLKDjYgYHCKQU2g/pTMRkxcbuJEvTnCyJOihl8=", "sum": "cajthvLKDjYgYHCKQU2g/pTMRkxcbuJEvTnCyJOihl8=",
"name": "thanos-mixin" "name": "thanos-mixin"
}, },
......
manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml
+ 71
− 0
View file @ 5f13edd1
...@@ -141,6 +141,77 @@ spec: ...@@ -141,6 +141,77 @@ spec:
type: string type: string
type: object type: object
type: array type: array
oauth2:
description: OAuth2 for the URL. Only valid in Prometheus versions 2.27.0 and newer.
properties:
clientId:
description: The secret or configmap containing the OAuth2 client id
properties:
configMap:
description: ConfigMap containing data to use for the targets.
properties:
key:
description: The key to select.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
optional:
description: Specify whether the ConfigMap or its key must be defined
type: boolean
required:
- key
type: object
secret:
description: Secret containing data to use for the targets.
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
optional:
description: Specify whether the Secret or its key must be defined
type: boolean
required:
- key
type: object
type: object
clientSecret:
description: The secret containing the OAuth2 client secret
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
optional:
description: Specify whether the Secret or its key must be defined
type: boolean
required:
- key
type: object
endpointParams:
additionalProperties:
type: string
description: Parameters to append to the token URL
type: object
scopes:
description: OAuth2 scopes used for the token request
items:
type: string
type: array
tokenUrl:
description: The URL to fetch the token from
minLength: 1
type: string
required:
- clientId
- clientSecret
- tokenUrl
type: object
params: params:
additionalProperties: additionalProperties:
items: items:
......
manifests/setup/prometheus-operator-0probeCustomResourceDefinition.yaml
+ 71
− 0
View file @ 5f13edd1
...@@ -90,6 +90,77 @@ spec: ...@@ -90,6 +90,77 @@ spec:
module: module:
description: 'The module to use for probing specifying how to probe the target. Example module configuring in the blackbox exporter: https://github.com/prometheus/blackbox_exporter/blob/master/example.yml' description: 'The module to use for probing specifying how to probe the target. Example module configuring in the blackbox exporter: https://github.com/prometheus/blackbox_exporter/blob/master/example.yml'
type: string type: string
oauth2:
description: OAuth2 for the URL. Only valid in Prometheus versions 2.27.0 and newer.
properties:
clientId:
description: The secret or configmap containing the OAuth2 client id
properties:
configMap:
description: ConfigMap containing data to use for the targets.
properties:
key:
description: The key to select.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
optional:
description: Specify whether the ConfigMap or its key must be defined
type: boolean
required:
- key
type: object
secret:
description: Secret containing data to use for the targets.
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
optional:
description: Specify whether the Secret or its key must be defined
type: boolean
required:
- key
type: object
type: object
clientSecret:
description: The secret containing the OAuth2 client secret
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
optional:
description: Specify whether the Secret or its key must be defined
type: boolean
required:
- key
type: object
endpointParams:
additionalProperties:
type: string
description: Parameters to append to the token URL
type: object
scopes:
description: OAuth2 scopes used for the token request
items:
type: string
type: array
tokenUrl:
description: The URL to fetch the token from
minLength: 1
type: string
required:
- clientId
- clientSecret
- tokenUrl
type: object
prober: prober:
description: Specification for the prober to use for probing targets. The prober.URL parameter is required. Targets cannot be probed if left empty. description: Specification for the prober to use for probing targets. The prober.URL parameter is required. Targets cannot be probed if left empty.
properties: properties:
......
manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
+ 71
− 0
View file @ 5f13edd1
...@@ -129,6 +129,77 @@ spec: ...@@ -129,6 +129,77 @@ spec:
type: string type: string
type: object type: object
type: array type: array
oauth2:
description: OAuth2 for the URL. Only valid in Prometheus versions 2.27.0 and newer.
properties:
clientId:
description: The secret or configmap containing the OAuth2 client id
properties:
configMap:
description: ConfigMap containing data to use for the targets.
properties:
key:
description: The key to select.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
optional:
description: Specify whether the ConfigMap or its key must be defined
type: boolean
required:
- key
type: object
secret:
description: Secret containing data to use for the targets.
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
optional:
description: Specify whether the Secret or its key must be defined
type: boolean
required:
- key
type: object
type: object
clientSecret:
description: The secret containing the OAuth2 client secret
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
optional:
description: Specify whether the Secret or its key must be defined
type: boolean
required:
- key
type: object
endpointParams:
additionalProperties:
type: string
description: Parameters to append to the token URL
type: object
scopes:
description: OAuth2 scopes used for the token request
items:
type: string
type: array
tokenUrl:
description: The URL to fetch the token from
minLength: 1
type: string
required:
- clientId
- clientSecret
- tokenUrl
type: object
params: params:
additionalProperties: additionalProperties:
items: items:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment