Skip to content

Commit

Permalink
[bot] [main] Automated version update
Browse files Browse the repository at this point in the history
  • Loading branch information
prom-op-bot committed Nov 6, 2023
1 parent c07f835 commit 41cc3fe
Show file tree
Hide file tree
Showing 12 changed files with 133 additions and 55 deletions.
32 changes: 16 additions & 16 deletions jsonnetfile.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
"version": "5cc9f7f7712a3de96c1afb4b9d85ed8e5b5fadd8",
"version": "02794b00eb0e964943c91d283106072e18fdc092",
"sum": "xuUBd2vqF7asyVDe5CE08uPT/RxAdy8O75EjFJoMXXU="
},
{
Expand Down Expand Up @@ -68,7 +68,7 @@
"subdir": "grafana-builder"
}
},
"version": "f076e1630911a6a332fa6a08209450b83d11e367",
"version": "a8de7212fa1dc27668344bffeb67f226d4ddcb8f",
"sum": "xEFMv4+ObwP5L1Wu0XK5agWci4AJzNApys6iKAQxLlQ="
},
{
Expand All @@ -88,8 +88,8 @@
"subdir": ""
}
},
"version": "42adb4b347a89c8e07f7ea7d459dee50fe56afe3",
"sum": "V1fCscAmNomABItd9KJUYj1hcy/yXR4elCrGVE/JLlw="
"version": "c1a315a7dbead0335a5e0486acc5583395b22a24",
"sum": "UVdL+uuFI8BSQgLfMJEJk2WDKsQXNT3dRHcr2Ti9rLI="
},
{
"source": {
Expand All @@ -98,8 +98,8 @@
"subdir": ""
}
},
"version": "3efc200d7e4a86c58cdfa974cf9c236d47e87b8c",
"sum": "VUmOX5Tuk1VoShfLBnwvOjiXf9WQn/4yRBTWnKlzogo="
"version": "d9a7f3a21d2b83198a3519eb4c0f9960b6b0a62f",
"sum": "PAdS42ZaVLJD8Pe5uZxOmyJHfwGIH49z0o2ucl4NK5g="
},
{
"source": {
Expand All @@ -108,7 +108,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
"version": "9a499d2a0531a770641ea6be745301d127536401",
"version": "82fd15ccc4a4c716721fcb135b1f7ef129025a3f",
"sum": "+dOzAK+fwsFf97uZpjcjTcEJEC1H8hh/j8f5uIQK/5g="
},
{
Expand All @@ -118,7 +118,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
"version": "9a499d2a0531a770641ea6be745301d127536401",
"version": "82fd15ccc4a4c716721fcb135b1f7ef129025a3f",
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
},
{
Expand All @@ -128,7 +128,7 @@
"subdir": "jsonnet/mixin"
}
},
"version": "18a2bad4f7742ff8c97dc73322289ec1eced1d74",
"version": "45185c8d5c0e97027f7e99beeb9114c5642aeec3",
"sum": "n3flMIzlADeyygb0uipZ4KPp2uNSjdtkrwgHjTC7Ca4=",
"name": "prometheus-operator-mixin"
},
Expand All @@ -139,8 +139,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "18a2bad4f7742ff8c97dc73322289ec1eced1d74",
"sum": "CvkfwykraJ/J/LdmTT6I5/cypzgKYfgX8PY5xu+zJpU="
"version": "45185c8d5c0e97027f7e99beeb9114c5642aeec3",
"sum": "bxqPs5CnlLpVZGc36H0QF/bbt4EcoEtFyASGt+9dR+E="
},
{
"source": {
Expand All @@ -149,7 +149,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
"version": "8512285e54f33199a454f0ccfa29a096c9f0072a",
"version": "fdea7e731cd0b07cb2a342f182dd4d37938b69db",
"sum": "1d7ZKYArJKacAWXLUz0bRC1uOkozee/PPw97/W5zGhc=",
"name": "alertmanager"
},
Expand All @@ -160,7 +160,7 @@
"subdir": "docs/node-mixin"
}
},
"version": "6122cee47a39ef35de5698b348fc5cf9343f28a5",
"version": "5ffc733af363848aa68e9d5412de2a031677eab1",
"sum": "By6n6U10hYDogUsyhsaKZehbhzxBZZobJloiKyKadgM="
},
{
Expand All @@ -170,8 +170,8 @@
"subdir": "documentation/prometheus-mixin"
}
},
"version": "e9b94515caa4c0d7a0e31f722a1534948ebad838",
"sum": "8OngT76gVXOUROOOeP9yTe6E/dn+2D2J34Dn690QCG0=",
"version": "69c9c29061e9be111654fd678abcb708d7a3dfd5",
"sum": "rNvddVTMNfaguOGzEGoeKjUsfhlXJBUImC+SIFNNCiM=",
"name": "prometheus"
},
{
Expand All @@ -192,7 +192,7 @@
"subdir": "mixin"
}
},
"version": "326c146ddd357ca892789cbef401b3cd08f49934",
"version": "c74a050a190486addc1ea1ca4b522462fc7ec680",
"sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
"name": "thanos-mixin"
},
Expand Down
62 changes: 31 additions & 31 deletions manifests/grafana-dashboardDefinitions.yaml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
operator.prometheus.io/version: 0.68.0
creationTimestamp: null
name: alertmanagerconfigs.monitoring.coreos.com
spec:
Expand Down
3 changes: 2 additions & 1 deletion manifests/setup/0alertmanagerCustomResourceDefinition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
operator.prometheus.io/version: 0.68.0
creationTimestamp: null
name: alertmanagers.monitoring.coreos.com
spec:
Expand Down Expand Up @@ -2792,7 +2793,7 @@ spec:
description: If set to true all actions on the underlying managed objects are not goint to be performed, except for delete actions.
type: boolean
podMetadata:
description: PodMetadata configures Labels and Annotations which are propagated to the alertmanager pods.
description: "PodMetadata configures labels and annotations which are propagated to the Alertmanager pods. \n The 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\"."
properties:
annotations:
additionalProperties:
Expand Down
1 change: 1 addition & 0 deletions manifests/setup/0podmonitorCustomResourceDefinition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
operator.prometheus.io/version: 0.68.0
creationTimestamp: null
name: podmonitors.monitoring.coreos.com
spec:
Expand Down
1 change: 1 addition & 0 deletions manifests/setup/0probeCustomResourceDefinition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
operator.prometheus.io/version: 0.68.0
creationTimestamp: null
name: probes.monitoring.coreos.com
spec:
Expand Down
54 changes: 50 additions & 4 deletions manifests/setup/0prometheusCustomResourceDefinition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
operator.prometheus.io/version: 0.68.0
creationTimestamp: null
name: prometheuses.monitoring.coreos.com
spec:
Expand Down Expand Up @@ -609,7 +610,7 @@ spec:
description: Version of the Alertmanager API that Prometheus uses to send alerts. It can be "v1" or "v2".
type: string
authorization:
description: "Authorization section for Alertmanager. \n Cannot be set at the same time as `basicAuth`, or `bearerTokenFile`."
description: "Authorization section for Alertmanager. \n Cannot be set at the same time as `basicAuth`, `bearerTokenFile` or `sigv4`."
properties:
credentials:
description: Selects a key of a Secret in the namespace that contains the credentials for authentication.
Expand All @@ -632,7 +633,7 @@ spec:
type: string
type: object
basicAuth:
description: "BasicAuth configuration for Alertmanager. \n Cannot be set at the same time as `bearerTokenFile`, or `authorization`."
description: "BasicAuth configuration for Alertmanager. \n Cannot be set at the same time as `bearerTokenFile`, `authorization` or `sigv4`."
properties:
password:
description: The secret in the service monitor namespace that contains the password for authentication.
Expand Down Expand Up @@ -668,7 +669,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
bearerTokenFile:
description: "File to read bearer token for Alertmanager. \n Cannot be set at the same time as `basicAuth`, or `authorization`. \n *Deprecated: this will be removed in a future release. Prefer using `authorization`.*"
description: "File to read bearer token for Alertmanager. \n Cannot be set at the same time as `basicAuth`, `authorization`, or `sigv4`. \n *Deprecated: this will be removed in a future release. Prefer using `authorization`.*"
type: string
enableHttp2:
description: Whether to enable HTTP2.
Expand All @@ -691,6 +692,51 @@ spec:
scheme:
description: Scheme to use when firing alerts.
type: string
sigv4:
description: "Sigv4 allows to configures AWS's Signature Verification 4 for the URL. \n It requires Prometheus >= v2.48.0. \n Cannot be set at the same time as `basicAuth`, `bearerTokenFile` or `authorization`."
properties:
accessKey:
description: AccessKey is the AWS API key. If not specified, the environment variable `AWS_ACCESS_KEY_ID` is used.
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
x-kubernetes-map-type: atomic
profile:
description: Profile is the named AWS profile used to authenticate.
type: string
region:
description: Region is the AWS region. If blank, the region from the default credentials chain used.
type: string
roleArn:
description: RoleArn is the named AWS profile used to authenticate.
type: string
secretKey:
description: SecretKey is the AWS API secret. If not specified, the environment variable `AWS_SECRET_ACCESS_KEY` is used.
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
x-kubernetes-map-type: atomic
type: object
timeout:
description: Timeout is a per-target Alertmanager timeout when pushing alerts.
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
Expand Down Expand Up @@ -2859,7 +2905,7 @@ spec:
description: When a Prometheus deployment is paused, no actions except for deletion will be performed on the underlying objects.
type: boolean
podMetadata:
description: PodMetadata configures labels and annotations which are propagated to the Prometheus pods.
description: "PodMetadata configures labels and annotations which are propagated to the Prometheus pods. \n The following items are reserved and cannot be overridden: * \"prometheus\" label, set to the name of the Prometheus object. * \"app.kubernetes.io/instance\" label, set to the name of the Prometheus object. * \"app.kubernetes.io/managed-by\" label, set to \"prometheus-operator\". * \"app.kubernetes.io/name\" label, set to \"prometheus\". * \"app.kubernetes.io/version\" label, set to the Prometheus version. * \"operator.prometheus.io/name\" label, set to the name of the Prometheus object. * \"operator.prometheus.io/shard\" label, set to the shard number of the Prometheus object. * \"kubectl.kubernetes.io/default-container\" annotation, set to \"prometheus\"."
properties:
annotations:
additionalProperties:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
operator.prometheus.io/version: 0.68.0
creationTimestamp: null
name: prometheusagents.monitoring.coreos.com
spec:
Expand Down Expand Up @@ -2588,7 +2589,7 @@ spec:
description: When a Prometheus deployment is paused, no actions except for deletion will be performed on the underlying objects.
type: boolean
podMetadata:
description: PodMetadata configures labels and annotations which are propagated to the Prometheus pods.
description: "PodMetadata configures labels and annotations which are propagated to the Prometheus pods. \n The following items are reserved and cannot be overridden: * \"prometheus\" label, set to the name of the Prometheus object. * \"app.kubernetes.io/instance\" label, set to the name of the Prometheus object. * \"app.kubernetes.io/managed-by\" label, set to \"prometheus-operator\". * \"app.kubernetes.io/name\" label, set to \"prometheus\". * \"app.kubernetes.io/version\" label, set to the Prometheus version. * \"operator.prometheus.io/name\" label, set to the name of the Prometheus object. * \"operator.prometheus.io/shard\" label, set to the shard number of the Prometheus object. * \"kubectl.kubernetes.io/default-container\" annotation, set to \"prometheus\"."
properties:
annotations:
additionalProperties:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
operator.prometheus.io/version: 0.68.0
creationTimestamp: null
name: prometheusrules.monitoring.coreos.com
spec:
Expand Down
26 changes: 25 additions & 1 deletion manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
operator.prometheus.io/version: 0.68.0
creationTimestamp: null
name: scrapeconfigs.monitoring.coreos.com
spec:
Expand Down Expand Up @@ -737,10 +738,33 @@ spec:
description: KubernetesSDConfig allows retrieving scrape targets from Kubernetes' REST API. See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#kubernetes_sd_config
properties:
role:
description: Role of the Kubernetes entities that should be discovered. Currently the only supported role is "Node".
description: Role of the Kubernetes entities that should be discovered.
enum:
- Node
- node
type: string
selectors:
description: Selector to select objects.
items:
description: K8SSelectorConfig is Kubernetes Selector Config
properties:
field:
type: string
label:
type: string
role:
description: K8SRole is role of the service in Kubernetes. Currently the only supported role is "Node".
enum:
- Node
- node
type: string
required:
- role
type: object
type: array
x-kubernetes-list-map-keys:
- role
x-kubernetes-list-type: map
required:
- role
type: object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
operator.prometheus.io/version: 0.68.0
creationTimestamp: null
name: servicemonitors.monitoring.coreos.com
spec:
Expand Down
3 changes: 2 additions & 1 deletion manifests/setup/0thanosrulerCustomResourceDefinition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
operator.prometheus.io/version: 0.68.0
creationTimestamp: null
name: thanosrulers.monitoring.coreos.com
spec:
Expand Down Expand Up @@ -2488,7 +2489,7 @@ spec:
description: When a ThanosRuler deployment is paused, no actions except for deletion will be performed on the underlying objects.
type: boolean
podMetadata:
description: PodMetadata contains Labels and Annotations gets propagated to the thanos ruler pods.
description: "PodMetadata configures labels and annotations which are propagated to the ThanosRuler pods. \n The following items are reserved and cannot be overridden: * \"app.kubernetes.io/name\" label, set to \"thanos-ruler\". * \"app.kubernetes.io/managed-by\" label, set to \"prometheus-operator\". * \"app.kubernetes.io/instance\" label, set to the name of the ThanosRuler instance. * \"thanos-ruler\" label, set to the name of the ThanosRuler instance. * \"kubectl.kubernetes.io/default-container\" annotation, set to \"thanos-ruler\"."
properties:
annotations:
additionalProperties:
Expand Down

0 comments on commit 41cc3fe

Please sign in to comment.