Skip to content

Commit 9018920

Browse files
Merge pull request #2500 from slashpai/OCPBUGS-42148
OCPBUGS-42148: Fix api doc on Thanos Ruler default retention
2 parents 82de4b7 + f19cc1a commit 9018920

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Diff for: Documentation/api.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ The `ThanosRulerConfig` resource defines configuration for the Thanos Ruler inst
613613
| logLevel | string | Defines the log level setting for Thanos Ruler. The possible values are `error`, `warn`, `info`, and `debug`. The default value is `info`. |
614614
| nodeSelector | map[string]string | Defines the nodes on which the Pods are scheduled. |
615615
| resources | *[v1.ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#resourcerequirements-v1-core) | Defines resource requests and limits for the Thanos Ruler container. |
616-
| retention | string | Defines the duration for which Prometheus retains data. This definition must be specified using the following regular expression pattern: `[0-9]+(ms\|s\|m\|h\|d\|w\|y)` (ms = milliseconds, s= seconds,m = minutes, h = hours, d = days, w = weeks, y = years). The default value is `15d`. |
616+
| retention | string | Defines the duration for which Prometheus retains data. This definition must be specified using the following regular expression pattern: `[0-9]+(ms\|s\|m\|h\|d\|w\|y)` (ms = milliseconds, s= seconds,m = minutes, h = hours, d = days, w = weeks, y = years). The default value is `24h`. |
617617
| tolerations | [][v1.Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#toleration-v1-core) | Defines tolerations for the pods. |
618618
| topologySpreadConstraints | []v1.TopologySpreadConstraint | Defines topology spread constraints for the pods. |
619619
| volumeClaimTemplate | *[monv1.EmbeddedPersistentVolumeClaim](https://github.com/prometheus-operator/prometheus-operator/blob/v0.76.0/Documentation/api.md#embeddedpersistentvolumeclaim) | Defines persistent storage for Thanos Ruler. Use this setting to configure the storage class and size of a volume. |

Diff for: Documentation/openshiftdocs/modules/thanosrulerconfig.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Appears in: link:userworkloadconfiguration.adoc[UserWorkloadConfiguration]
2626

2727
|resources|*v1.ResourceRequirements|Defines resource requests and limits for the Thanos Ruler container.
2828

29-
|retention|string|Defines the duration for which Prometheus retains data. This definition must be specified using the following regular expression pattern: `[0-9]+(ms\|s\|m\|h\|d\|w\|y)` (ms = milliseconds, s= seconds,m = minutes, h = hours, d = days, w = weeks, y = years). The default value is `15d`.
29+
|retention|string|Defines the duration for which Prometheus retains data. This definition must be specified using the following regular expression pattern: `[0-9]+(ms\|s\|m\|h\|d\|w\|y)` (ms = milliseconds, s= seconds,m = minutes, h = hours, d = days, w = weeks, y = years). The default value is `24h`.
3030

3131
|tolerations|[]v1.Toleration|Defines tolerations for the pods.
3232

Diff for: pkg/manifests/types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@ type ThanosRulerConfig struct {
703703
// This definition must be specified using the following regular
704704
// expression pattern: `[0-9]+(ms|s|m|h|d|w|y)` (ms = milliseconds,
705705
// s= seconds,m = minutes, h = hours, d = days, w = weeks, y = years).
706-
// The default value is `15d`.
706+
// The default value is `24h`.
707707
Retention string `json:"retention,omitempty"`
708708
// Defines tolerations for the pods.
709709
Tolerations []v1.Toleration `json:"tolerations,omitempty"`

0 commit comments

Comments
 (0)