Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[rhobs]: lower pv volumes to comply with cluster limits #631

Merged
merged 3 commits into from
Oct 26, 2023
Merged

[rhobs]: lower pv volumes to comply with cluster limits #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46eefda
lower pv volumes to comply with cluster limits
thibaultmg Oct 25, 2023
af76362
fix lint
thibaultmg Oct 25, 2023
569737e
fix ci
thibaultmg Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crds/loki.grafana.com_alertingrules.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
},
creationTimestamp: null,
labels: {
'app.kubernetes.io/instance': 'loki-operator-v0.4.0',
'app.kubernetes.io/instance': 'loki-operator-v0.5.0',
'app.kubernetes.io/managed-by': 'operator-lifecycle-manager',
'app.kubernetes.io/name': 'loki-operator',
'app.kubernetes.io/part-of': 'loki-operator',
'app.kubernetes.io/version': '0.4.0',
'app.kubernetes.io/version': '0.5.0',
},
name: 'alertingrules.loki.grafana.com',
},
Expand Down
4 changes: 2 additions & 2 deletions crds/loki.grafana.com_recordingrules.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
},
creationTimestamp: null,
labels: {
'app.kubernetes.io/instance': 'loki-operator-v0.4.0',
'app.kubernetes.io/instance': 'loki-operator-v0.5.0',
'app.kubernetes.io/managed-by': 'operator-lifecycle-manager',
'app.kubernetes.io/name': 'loki-operator',
'app.kubernetes.io/part-of': 'loki-operator',
'app.kubernetes.io/version': '0.4.0',
'app.kubernetes.io/version': '0.5.0',
},
name: 'recordingrules.loki.grafana.com',
},
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@ require (
)

// Delete when https://github.com/observatorium/observatorium/pull/543 is merged to main branch
replace github.com/observatorium/observatorium => github.com/thibaultmg/observatorium v0.0.0-20231023163509-c3d0fcdbc308
replace github.com/observatorium/observatorium => github.com/thibaultmg/observatorium v0.0.0-20231025143846-a046a9340273
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1253,8 +1253,8 @@ github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG
github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I=
github.com/thibaultmg/observatorium v0.0.0-20231023163509-c3d0fcdbc308 h1:uoMrN3mGQEWpyAYKSHiCCBIGAQ/ZUoWXAuJMcmj5gNw=
github.com/thibaultmg/observatorium v0.0.0-20231023163509-c3d0fcdbc308/go.mod h1:bLPMJSS2A0TuqJGX4SXeBV0B0oZgXElyYRSUJsZVJTg=
github.com/thibaultmg/observatorium v0.0.0-20231025143846-a046a9340273 h1:Jokq2uymLdQgQXMa+MPIEtD6bXciRQcySjp18KSj7kY=
github.com/thibaultmg/observatorium v0.0.0-20231025143846-a046a9340273/go.mod h1:bLPMJSS2A0TuqJGX4SXeBV0B0oZgXElyYRSUJsZVJTg=
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
Expand Down
8 changes: 4 additions & 4 deletions resources/crds/observatorium-logs-crds-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ objects:
controller-gen.kubebuilder.io/version: v0.13.0
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.4.0
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.4.0
app.kubernetes.io/version: 0.5.0
name: alertingrules.loki.grafana.com
spec:
group: loki.grafana.com
Expand Down Expand Up @@ -290,11 +290,11 @@ objects:
controller-gen.kubebuilder.io/version: v0.13.0
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.4.0
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.4.0
app.kubernetes.io/version: 0.5.0
name: recordingrules.loki.grafana.com
spec:
group: loki.grafana.com
Expand Down
4 changes: 2 additions & 2 deletions ...p-sre-stage-01/rhobs/default/observatorium-metrics-receive-ingestor-default-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@ objects:
- ReadWriteOnce
resources:
requests:
storage: 100Gi
storageClassName: ""
storage: 5Gi
storageClassName: gp2
- apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
Expand Down
2 changes: 1 addition & 1 deletion ...services/app-sre-stage-01/rhobs/default/observatorium-metrics-store-default-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ objects:
- ReadWriteOnce
resources:
requests:
storage: 50Gi
storage: 5Gi
storageClassName: gp2
parameters:
- name: LOG_LEVEL
Expand Down
4 changes: 2 additions & 2 deletions ...ces/app-sre-stage-01/rhobs/rhel/observatorium-metrics-receive-ingestor-rhel-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@ objects:
- ReadWriteOnce
resources:
requests:
storage: 100Gi
storageClassName: ""
storage: 5Gi
storageClassName: gp2
- apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
Expand Down
2 changes: 1 addition & 1 deletion ...urces/services/app-sre-stage-01/rhobs/rhel/observatorium-metrics-store-rhel-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ objects:
- ReadWriteOnce
resources:
requests:
storage: 50Gi
storage: 5Gi
storageClassName: gp2
parameters:
- name: LOG_LEVEL
Expand Down
4 changes: 2 additions & 2 deletions ...e-stage-01/rhobs/telemeter/observatorium-metrics-receive-ingestor-telemeter-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@ objects:
- ReadWriteOnce
resources:
requests:
storage: 100Gi
storageClassName: ""
storage: 5Gi
storageClassName: gp2
- apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
Expand Down
2 changes: 1 addition & 1 deletion ...ices/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-store-telemeter-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ objects:
- ReadWriteOnce
resources:
requests:
storage: 50Gi
storage: 5Gi
storageClassName: gp2
parameters:
- name: LOG_LEVEL
Expand Down
4 changes: 2 additions & 2 deletions ...emeter-prod-01/rhobs/default/observatorium-metrics-receive-ingestor-default-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@ objects:
- ReadWriteOnce
resources:
requests:
storage: 100Gi
storageClassName: ""
storage: 5Gi
storageClassName: gp2
- apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
Expand Down
2 changes: 1 addition & 1 deletion ...ervices/telemeter-prod-01/rhobs/default/observatorium-metrics-store-default-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ objects:
- ReadWriteOnce
resources:
requests:
storage: 50Gi
storage: 5Gi
storageClassName: gp2
parameters:
- name: LOG_LEVEL
Expand Down
6 changes: 5 additions & 1 deletion ...urces/services/telemeter-prod-01/rhobs/observatorium-metrics-receive-router-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
objects:
- apiVersion: v1
data:
hashrings.json: '[{"hashring":"default","tenants":["3833951d-bede-4a53-85e5-f73f4913973f","9ca26972-4328-4fe3-92db-31302013d03f","AC879303-C60F-4D0D-A6D5-A485CFD638B8","99c885bc-2d64-4c4d-b55e-8bf30d98c657","770c1124-6ae8-4324-a9d4-9ce08590094b","37b8fd3f-56ff-4b64-8272-917c9b0d1623","d17ea8ce-d4c6-42ef-b259-7d10c9227e93","1b9b6e43-9128-4bbf-bfff-3c120bbe6f11","0fc2b00e-201b-4c17-b9f2-19d91adc4fd2","8ace13a2-1c72-4559-b43d-ab43e32a255a","0031e8d6-e50a-47ea-aecb-c7e0bd84b3f1"],"algorithm":"ketama"},{"hashring":"rhel","tenants":["72e6f641-b2e2-47eb-bbc2-fee3c8fbda26"],"algorithm":"ketama"},{"hashring":"telemeter","algorithm":"ketama"}]'
hashrings.json: '[{"hashring":"default","tenants":["3833951d-bede-4a53-85e5-f73f4913973f","9ca26972-4328-4fe3-92db-31302013d03f","AC879303-C60F-4D0D-A6D5-A485CFD638B8","99c885bc-2d64-4c4d-b55e-8bf30d98c657","770c1124-6ae8-4324-a9d4-9ce08590094b","37b8fd3f-56ff-4b64-8272-917c9b0d1623","d17ea8ce-d4c6-42ef-b259-7d10c9227e93","1b9b6e43-9128-4bbf-bfff-3c120bbe6f11","0fc2b00e-201b-4c17-b9f2-19d91adc4fd2","8ace13a2-1c72-4559-b43d-ab43e32a255a","0031e8d6-e50a-47ea-aecb-c7e0bd84b3f1"],"algorithm":"ketama"},{"hashring":"rhel","tenants":["72e6f641-b2e2-47eb-bbc2-fee3c8fbda26"],"algorithm":"ketama"},{"hashring":"telemeter","tenants":["FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"],"algorithm":"ketama"}]'
kind: ConfigMap
metadata:
creationTimestamp: null
Expand Down Expand Up @@ -185,6 +185,10 @@ objects:
meta_monitoring_limit_query: sum(prometheus_tsdb_head_series{namespace="rhobs"})
by (tenant)
tenants:
1b9b6e43-9128-4bbf-bfff-3c120bbe6f11:
head_series_limit: 10000000
0031e8d6-e50a-47ea-aecb-c7e0bd84b3f1:
head_series_limit: 200000
72e6f641-b2e2-47eb-bbc2-fee3c8fbda26:
request:
series_limit: 10
Expand Down
4 changes: 2 additions & 2 deletions ...es/telemeter-prod-01/rhobs/rhel/observatorium-metrics-receive-ingestor-rhel-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@ objects:
- ReadWriteOnce
resources:
requests:
storage: 100Gi
storageClassName: ""
storage: 5Gi
storageClassName: gp2
- apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
Expand Down
2 changes: 1 addition & 1 deletion ...rces/services/telemeter-prod-01/rhobs/rhel/observatorium-metrics-store-rhel-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ objects:
- ReadWriteOnce
resources:
requests:
storage: 50Gi
storage: 5Gi
storageClassName: gp2
parameters:
- name: LOG_LEVEL
Expand Down
4 changes: 2 additions & 2 deletions ...er-prod-01/rhobs/telemeter/observatorium-metrics-receive-ingestor-telemeter-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@ objects:
- ReadWriteOnce
resources:
requests:
storage: 100Gi
storageClassName: ""
storage: 5Gi
storageClassName: gp2
- apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
Expand Down
2 changes: 1 addition & 1 deletion ...ces/telemeter-prod-01/rhobs/telemeter/observatorium-metrics-store-telemeter-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ objects:
- ReadWriteOnce
resources:
requests:
storage: 50Gi
storage: 5Gi
storageClassName: gp2
parameters:
- name: LOG_LEVEL
Expand Down
Loading
Loading