Skip to content

Commit

Permalink
Merge pull request #472 from gitpod-io/roboquat/automated-dependency-…
Browse files Browse the repository at this point in the history 
…update-main

[bot] [main] Automated dependencies update
  • Loading branch information
@roboquat
roboquat authored Jul 3, 2023
2 parents a3e73bb + 5dbe816 commit af023fe
Show file tree
Hide file tree
Showing 9 changed files with 1,227 additions and 536 deletions.
34 changes: 17 additions & 17 deletions jsonnetfile.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
"version": "120f1d6d058689d42f9f6c7b0aafddcb623f436f",
"version": "57a583d14021c3f2ffd25ceae6993a28a3a0a691",
"sum": "GdePvMDfLQcVhwzk/Ephi/jC27ywGObLB5t0eC0lXd4="
},
{
Expand All @@ -28,8 +28,8 @@
"subdir": "operations/observability/mixins"
}
},
"version": "16960334b2786e37443a71d0235ba0c118fa7527",
"sum": "XjthfthWm+1YLsNQQ2MOtrNXeN1bH/b9Nhq87DGkoJ4=",
"version": "2933eeef5476b6a142691ed72a236c0df2abd197",
"sum": "NzRQn9P2uTW42KbRRt/qJceIhOB2ZDIZ3iCGJm4Cj2g=",
"name": "gitpod"
},
{
Expand Down Expand Up @@ -69,8 +69,8 @@
"subdir": "grafana-builder"
}
},
"version": "48da1834254f19d592a33ccfee18159af96be6f3",
"sum": "wp/L/9smcsHIiy24DH5WWMv2fcSckN2Lw/m7qDszaWU="
"version": "6621ddc23751d828e9d4b78fda38c1fa3f6bdc84",
"sum": "RJjFQa1n8CDbB6m1fBQQzPye7jhOhGTUbma27Gil81I="
},
{
"source": {
Expand All @@ -89,7 +89,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
"version": "3d46fe0f72b6776ec89d21b0a7293e98ba37cb73",
"version": "bb6e9f42f8bac32ed6e50b6932cb2ab7fc9307ef",
"sum": "+dOzAK+fwsFf97uZpjcjTcEJEC1H8hh/j8f5uIQK/5g="
},
{
Expand All @@ -99,7 +99,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
"version": "3d46fe0f72b6776ec89d21b0a7293e98ba37cb73",
"version": "bb6e9f42f8bac32ed6e50b6932cb2ab7fc9307ef",
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
},
{
Expand All @@ -109,8 +109,8 @@
"subdir": "jsonnet/kube-prometheus"
}
},
"version": "27a3f25bd9e89bc0c098a9555c5e418738984b34",
"sum": "Y5hfY0tM5HjeyrMFkBFDK8bCWBKBBOhTi4onp7PX6L4="
"version": "858a2a53f42720a8baa048de5984835deb59328d",
"sum": "FzjnypwmXckNVkLHv3oMlvW3HrWX7NMZzw19RTwOal0="
},
{
"source": {
Expand All @@ -119,7 +119,7 @@
"subdir": "jsonnet/mixin"
}
},
"version": "d713f068992514f670f230d5e31985d8b0298678",
"version": "5457c5c34c034316dc982d6b882bb4a77ae34002",
"sum": "n3flMIzlADeyygb0uipZ4KPp2uNSjdtkrwgHjTC7Ca4=",
"name": "prometheus-operator-mixin"
},
Expand All @@ -130,8 +130,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "d713f068992514f670f230d5e31985d8b0298678",
"sum": "7WhWigpP6FgMuWd54jzWP/XV1jGhWHBE4Jew8Dx8FmI="
"version": "5457c5c34c034316dc982d6b882bb4a77ae34002",
"sum": "RgD961BWKDlZ0W+gp7RaAWP/HoYlTusbnkhoRFjjg+g="
},
{
"source": {
Expand All @@ -140,7 +140,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
"version": "a85979e19d24490322d5ce342301d17b0f13dcc5",
"version": "11e0edb1d2d21e80325a64a4a14ec088d521aea6",
"sum": "PsK+V7oETCPKu2gLoPfqY0wwPKH9TzhNj6o2xezjjXc=",
"name": "alertmanager"
},
Expand All @@ -151,7 +151,7 @@
"subdir": "docs/node-mixin"
}
},
"version": "a11de2ede5b92809fa054066901572d26b8deefc",
"version": "c31ebb43590cb0055acd4bc00a432f6a2dafdd08",
"sum": "aFUI56y6Y8EpniS4cfYqrSaHFnxeomIw4S4+Sz8yPtQ="
},
{
Expand All @@ -161,7 +161,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
"version": "391ecaec9a609cddfbeceae28ad44c4ecd134a8d",
"version": "031d22df9e43f1c3014b8344337e133099902ae8",
"sum": "WkRzFpnseUc/Ev8I2QBLxAC4vkPwLHeOGUw5QemCsMU=",
"name": "prometheus"
},
Expand All @@ -182,8 +182,8 @@
"subdir": "mixin"
}
},
"version": "40e1b2d665afac702f41f5dce3500add142a2d99",
"sum": "sSbomPrsOdR93YE8fjp/PC0/QrQMQpZMY5oi8Zq2awQ=",
"version": "37cf55964d88c2afd305e635e8dd0045826610db",
"sum": "WhheqsiX0maUXByZFsb9xhCEsGXK2955bPmPPf1x+Cs=",
"name": "thanos-mixin"
},
{
Expand Down
216 changes: 216 additions & 0 deletions ...ng-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,104 @@ spec:
description: RefreshInterval configures the refresh interval at which Prometheus will re-query the endpoint to update the target list.
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
type: string
tlsConfig:
description: TLS configuration applying to the target HTTP endpoint.
properties:
ca:
description: Certificate authority used when verifying server certificates.
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
x-kubernetes-map-type: atomic
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
x-kubernetes-map-type: atomic
type: object
cert:
description: Client certificate to present when doing client-authentication.
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
x-kubernetes-map-type: atomic
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
x-kubernetes-map-type: atomic
type: object
insecureSkipVerify:
description: Disable target certificate validation.
type: boolean
keySecret:
description: Secret containing the client key file 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
x-kubernetes-map-type: atomic
serverName:
description: Used to verify the hostname for the targets.
type: string
type: object
url:
description: URL from which the targets are fetched.
minLength: 1
Expand All @@ -197,6 +295,18 @@ spec:
- url
type: object
type: array
labelLimit:
description: Per-scrape limit on number of labels that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
format: int64
type: integer
labelNameLengthLimit:
description: Per-scrape limit on length of labels name that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
format: int64
type: integer
labelValueLengthLimit:
description: Per-scrape limit on length of labels value that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
format: int64
type: integer
metricsPath:
description: MetricsPath HTTP path to scrape for metrics. If empty, Prometheus uses the default value (e.g. /metrics).
type: string
Expand Down Expand Up @@ -257,6 +367,10 @@ spec:
type: string
type: object
type: array
sampleLimit:
description: SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
format: int64
type: integer
scheme:
description: Configures the protocol scheme used for requests. If empty, Prometheus uses HTTP by default.
enum:
Expand All @@ -282,6 +396,108 @@ spec:
type: array
type: object
type: array
targetLimit:
description: TargetLimit defines a limit on the number of scraped targets that will be accepted.
format: int64
type: integer
tlsConfig:
description: TLS configuration to use on every scrape request
properties:
ca:
description: Certificate authority used when verifying server certificates.
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
x-kubernetes-map-type: atomic
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
x-kubernetes-map-type: atomic
type: object
cert:
description: Client certificate to present when doing client-authentication.
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
x-kubernetes-map-type: atomic
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
x-kubernetes-map-type: atomic
type: object
insecureSkipVerify:
description: Disable target certificate validation.
type: boolean
keySecret:
description: Secret containing the client key file 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
x-kubernetes-map-type: atomic
serverName:
description: Used to verify the hostname for the targets.
type: string
type: object
type: object
required:
- spec
Expand Down
Loading

0 comments on commit af023fe

Please sign in to comment.