Skip to content

Commit

Permalink
Merge pull request #543 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 Jun 21, 2024
2 parents 048c1ac + e1dfa8b commit bd73eeb
Show file tree
Hide file tree
Showing 10 changed files with 223 additions and 41 deletions.
22 changes: 11 additions & 11 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": "a043da50fe28fd3d396ec44de2397283fdf6c311",
"version": "1d13fc58ff534da94adec85bdf550f0fe3a3a956",
"sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
},
{
Expand All @@ -28,8 +28,8 @@
"subdir": "operations/observability/mixins"
}
},
"version": "4c5ff41c86999cfdce8cea2df5a9762316c2dd97",
"sum": "ssmRck1uX4a4d1iXekEUACoR6I6tQNoa/K5xHeuaNzc=",
"version": "7512a3e0ddd5a1c3ede85b12d72abb114836ecf1",
"sum": "HlC/z0aF8fbN+5y7AP0NNsvg9n3hFvoLr5w/8tUEn98=",
"name": "gitpod"
},
{
Expand Down Expand Up @@ -99,7 +99,7 @@
"subdir": "grafana-builder"
}
},
"version": "7edee59fb5d759f4960cb27ea8459abb65404b1e",
"version": "a49eaa8de3eb6c22818418fdd4b9aed2f40a15a5",
"sum": "5ku1Hd8UPnjmn8nWyaTFzMpT3Pa+VylBnmposMSVEuU="
},
{
Expand Down Expand Up @@ -169,7 +169,7 @@
"subdir": "jsonnet/mixin"
}
},
"version": "30b712697c1cfe072c285eb43ec37631909bf4cf",
"version": "94823a886f2b835a1248059283ddbedf837269bf",
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
"name": "prometheus-operator-mixin"
},
Expand All @@ -180,8 +180,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "30b712697c1cfe072c285eb43ec37631909bf4cf",
"sum": "nCXBmTcj3rscxKYbNmr074F3S9gPNsCDf9Gb6Kvl6us="
"version": "94823a886f2b835a1248059283ddbedf837269bf",
"sum": "uL7mkBVkxqnDpr4oSrm+dto2eSZrsIbZ4gV5CbLsC4c="
},
{
"source": {
Expand All @@ -190,7 +190,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
"version": "730bd752d15622c12999ac55399fd3123579ce63",
"version": "36d653ab9f2c8784c8ea99563abc743735bb2843",
"sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=",
"name": "alertmanager"
},
Expand All @@ -211,8 +211,8 @@
"subdir": "documentation/prometheus-mixin"
}
},
"version": "5c417684f87f2e7f55b172b3e5e5c96ac9bc2e2c",
"sum": "vGD+MxGadIBvvDC+/71BRKWEA8vHgcuBP5PcuCKZGEs=",
"version": "d78253319daa62c8f28ed47e40bafcad2dd8b586",
"sum": "dYLcLzGH4yF3qB7OGC/7z4nqeTNjv42L7Q3BENU8XJI=",
"name": "prometheus"
},
{
Expand All @@ -233,7 +233,7 @@
"subdir": "mixin"
}
},
"version": "d9095d10c43316e418376f7599b6c04c1e3a8476",
"version": "0ff119d9fdaff53566079594cdfed8f6c3b268e8",
"sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
"name": "thanos-mixin"
},
Expand Down
4 changes: 4 additions & 0 deletions ...ellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2784,6 +2784,10 @@ spec:
Either `token` or `tokenFile` is required.
It requires Alertmanager >= v0.26.0.
type: string
ttl:
description: The time to live definition for the alert notification
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
url:
description: A supplementary URL shown alongside the message.
type: string
Expand Down
77 changes: 77 additions & 0 deletions ...ring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1993,6 +1993,10 @@ spec:
description: |-
BodySizeLimit defines per-scrape on response body size.
Only valid in Prometheus versions 2.45.0 and newer.


Note 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 enforcedBodySizeLimit.
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
configMaps:
Expand Down Expand Up @@ -3452,6 +3456,13 @@ spec:


It requires Prometheus >= v2.28.0.


When both `enforcedBodySizeLimit` and `bodySizeLimit` are defined and greater than zero, the following rules apply:
* Scrape objects without a defined bodySizeLimit value will inherit the global bodySizeLimit value (Prometheus >= 2.45.0) or the enforcedBodySizeLimit value (Prometheus < v2.45.0).
If Prometheus version is >= 2.45.0 and the `enforcedBodySizeLimit` is greater than the `bodySizeLimit`, the `bodySizeLimit` will be set to `enforcedBodySizeLimit`.
* Scrape objects with a bodySizeLimit value less than or equal to enforcedBodySizeLimit keep their specific value.
* Scrape objects with a bodySizeLimit value greater than enforcedBodySizeLimit are set to enforcedBodySizeLimit.
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
enforcedKeepDroppedTargets:
Expand All @@ -3464,6 +3475,13 @@ spec:


It requires Prometheus >= v2.47.0.


When both `enforcedKeepDroppedTargets` and `keepDroppedTargets` are defined and greater than zero, the following rules apply:
* Scrape objects without a defined keepDroppedTargets value will inherit the global keepDroppedTargets value (Prometheus >= 2.45.0) or the enforcedKeepDroppedTargets value (Prometheus < v2.45.0).
If Prometheus version is >= 2.45.0 and the `enforcedKeepDroppedTargets` is greater than the `keepDroppedTargets`, the `keepDroppedTargets` will be set to `enforcedKeepDroppedTargets`.
* Scrape objects with a keepDroppedTargets value less than or equal to enforcedKeepDroppedTargets keep their specific value.
* Scrape objects with a keepDroppedTargets value greater than enforcedKeepDroppedTargets are set to enforcedKeepDroppedTargets.
format: int64
type: integer
enforcedLabelLimit:
Expand All @@ -3475,6 +3493,13 @@ spec:


It requires Prometheus >= v2.27.0.


When both `enforcedLabelLimit` and `labelLimit` are defined and greater than zero, the following rules apply:
* Scrape objects without a defined labelLimit value will inherit the global labelLimit value (Prometheus >= 2.45.0) or the enforcedLabelLimit value (Prometheus < v2.45.0).
If Prometheus version is >= 2.45.0 and the `enforcedLabelLimit` is greater than the `labelLimit`, the `labelLimit` will be set to `enforcedLabelLimit`.
* Scrape objects with a labelLimit value less than or equal to enforcedLabelLimit keep their specific value.
* Scrape objects with a labelLimit value greater than enforcedLabelLimit are set to enforcedLabelLimit.
format: int64
type: integer
enforcedLabelNameLengthLimit:
Expand All @@ -3486,6 +3511,13 @@ spec:


It requires Prometheus >= v2.27.0.


When both `enforcedLabelNameLengthLimit` and `labelNameLengthLimit` are defined and greater than zero, the following rules apply:
* Scrape objects without a defined labelNameLengthLimit value will inherit the global labelNameLengthLimit value (Prometheus >= 2.45.0) or the enforcedLabelNameLengthLimit value (Prometheus < v2.45.0).
If Prometheus version is >= 2.45.0 and the `enforcedLabelNameLengthLimit` is greater than the `labelNameLengthLimit`, the `labelNameLengthLimit` will be set to `enforcedLabelNameLengthLimit`.
* Scrape objects with a labelNameLengthLimit value less than or equal to enforcedLabelNameLengthLimit keep their specific value.
* Scrape objects with a labelNameLengthLimit value greater than enforcedLabelNameLengthLimit are set to enforcedLabelNameLengthLimit.
format: int64
type: integer
enforcedLabelValueLengthLimit:
Expand All @@ -3497,6 +3529,13 @@ spec:


It requires Prometheus >= v2.27.0.


When both `enforcedLabelValueLengthLimit` and `labelValueLengthLimit` are defined and greater than zero, the following rules apply:
* Scrape objects without a defined labelValueLengthLimit value will inherit the global labelValueLengthLimit value (Prometheus >= 2.45.0) or the enforcedLabelValueLengthLimit value (Prometheus < v2.45.0).
If Prometheus version is >= 2.45.0 and the `enforcedLabelValueLengthLimit` is greater than the `labelValueLengthLimit`, the `labelValueLengthLimit` will be set to `enforcedLabelValueLengthLimit`.
* Scrape objects with a labelValueLengthLimit value less than or equal to enforcedLabelValueLengthLimit keep their specific value.
* Scrape objects with a labelValueLengthLimit value greater than enforcedLabelValueLengthLimit are set to enforcedLabelValueLengthLimit.
format: int64
type: integer
enforcedNamespaceLabel:
Expand Down Expand Up @@ -3528,6 +3567,13 @@ spec:

It is meant to be used by admins to keep the overall number of
samples/series under a desired limit.


When both `enforcedSampleLimit` and `sampleLimit` are defined and greater than zero, the following rules apply:
* Scrape objects without a defined sampleLimit value will inherit the global sampleLimit value (Prometheus >= 2.45.0) or the enforcedSampleLimit value (Prometheus < v2.45.0).
If Prometheus version is >= 2.45.0 and the `enforcedSampleLimit` is greater than the `sampleLimit`, the `sampleLimit` will be set to `enforcedSampleLimit`.
* Scrape objects with a sampleLimit value less than or equal to enforcedSampleLimit keep their specific value.
* Scrape objects with a sampleLimit value greater than enforcedSampleLimit are set to enforcedSampleLimit.
format: int64
type: integer
enforcedTargetLimit:
Expand All @@ -3540,6 +3586,13 @@ spec:

It is meant to be used by admins to to keep the overall number of
targets under a desired limit.


When both `enforcedTargetLimit` and `targetLimit` are defined and greater than zero, the following rules apply:
* Scrape objects without a defined targetLimit value will inherit the global targetLimit value (Prometheus >= 2.45.0) or the enforcedTargetLimit value (Prometheus < v2.45.0).
If Prometheus version is >= 2.45.0 and the `enforcedTargetLimit` is greater than the `targetLimit`, the `targetLimit` will be set to `enforcedTargetLimit`.
* Scrape objects with a targetLimit value less than or equal to enforcedTargetLimit keep their specific value.
* Scrape objects with a targetLimit value greater than enforcedTargetLimit are set to enforcedTargetLimit.
format: int64
type: integer
evaluationInterval:
Expand Down Expand Up @@ -5112,24 +5165,40 @@ spec:


It requires Prometheus >= v2.47.0.


Note 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 enforcedKeepDroppedTargets.
format: int64
type: integer
labelLimit:
description: |-
Per-scrape limit on number of labels that will be accepted for a sample.
Only valid in Prometheus versions 2.45.0 and newer.


Note 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 enforcedLabelLimit.
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.45.0 and newer.


Note 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 enforcedLabelNameLengthLimit.
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.45.0 and newer.


Note 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 enforcedLabelValueLengthLimit.
format: int64
type: integer
listenLocal:
Expand Down Expand Up @@ -7102,6 +7171,10 @@ spec:
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.


Note 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.
format: int64
type: integer
scrapeClasses:
Expand Down Expand Up @@ -8604,6 +8677,10 @@ spec:
description: |-
TargetLimit defines a limit on the number of scraped targets that will be accepted.
Only valid in Prometheus versions 2.45.0 and newer.


Note 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 enforcedTargetLimit.
format: int64
type: integer
thanos:
Expand Down
Loading

0 comments on commit bd73eeb

Please sign in to comment.