-
-
Notifications
You must be signed in to change notification settings - Fork 192
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.
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
feat(container)!: Update thanos ( 12.23.1 β 13.0.0 ) #6963
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bot-ross
bot
added
renovate/container
type/major
area/kubernetes
Changes made in the kubernetes directory
cluster/main
labels
Feb 14, 2024
--- kubernetes/main/apps/observability/thanos/app Kustomization: flux-system/thanos HelmRelease: observability/thanos
+++ kubernetes/main/apps/observability/thanos/app Kustomization: flux-system/thanos HelmRelease: observability/thanos
@@ -13,13 +13,13 @@
spec:
chart: thanos
sourceRef:
kind: HelmRepository
name: bitnami
namespace: flux-system
- version: 12.23.1
+ version: 13.0.0
dependsOn:
- name: openebs
namespace: openebs-system
- name: redis
namespace: database
- name: rook-ceph-cluster
@@ -35,18 +35,22 @@
cleanupOnFail: true
remediation:
retries: 3
values:
bucketweb:
enabled: true
+ networkPolicy:
+ enabled: false
replicaCount: 2
compactor:
enabled: true
extraFlags:
- --compact.concurrency=4
- --delete-delay=30m
+ networkPolicy:
+ enabled: false
persistence:
enabled: true
size: 10Gi
storageClass: openebs-hostpath
retentionResolution1h: 60d
retentionResolution5m: 30d
@@ -65,12 +69,14 @@
type: s3
query:
dnsDiscovery:
sidecarsNamespace: observability
sidecarsService: kube-prometheus-stack-thanos-discovery
enabled: true
+ networkPolicy:
+ enabled: false
replicaCount: 2
replicaLabel:
- __replica__
stores:
- thanos.turbo.ac:10901
queryFrontend:
@@ -89,13 +95,19 @@
extraTls:
- hosts:
- thanos-query-frontend.devbu.io
hostname: thanos-query-frontend.devbu.io
ingressClassName: internal
tls: true
+ networkPolicy:
+ enabled: false
replicaCount: 2
+ receive:
+ enabled: false
+ networkPolicy:
+ enabled: false
ruler:
alertmanagers:
- http://alertmanager-operated.observability.svc.cluster.local:9093
config: |-
groups:
- name: PrometheusWatcher
@@ -107,12 +119,14 @@
for: 5m
labels:
severity: critical
enabled: true
extraFlags:
- --web.prefix-header=X-Forwarded-Prefix
+ networkPolicy:
+ enabled: false
persistence:
enabled: true
size: 10Gi
storageClass: openebs-hostpath
replicaCount: 2
replicaLabel: __replica__
@@ -124,12 +138,14 @@
redis-node-0.redis-headless.database.svc.cluster.local:26379,
redis-node-1.redis-headless.database.svc.cluster.local:26379,
redis-node-2.redis-headless.database.svc.cluster.local:26379
db: 13
master_name: redis-master
enabled: true
+ networkPolicy:
+ enabled: false
persistence:
enabled: true
size: 10Gi
storageClass: openebs-hostpath
replicaCount: 2
valuesFrom: |
--- HelmRelease: observability/thanos ServiceAccount: observability/thanos
+++ HelmRelease: observability/thanos ServiceAccount: observability/thanos
@@ -1,13 +0,0 @@
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
- name: thanos
- namespace: observability
- labels:
- app.kubernetes.io/instance: thanos
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/name: thanos
- app.kubernetes.io/component: storegateway
-automountServiceAccountToken: false
-
--- HelmRelease: observability/thanos ConfigMap: observability/thanos-query-frontend-configmap
+++ HelmRelease: observability/thanos ConfigMap: observability/thanos-query-frontend-configmap
@@ -1,22 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: thanos-query-frontend-configmap
- namespace: observability
- labels:
- app.kubernetes.io/instance: thanos
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/name: thanos
- app.kubernetes.io/component: query-frontend
-data:
- config.yml: |-
- type: REDIS
- config:
- addr: >-
- redis-node-0.redis-headless.database.svc.cluster.local:26379,
- redis-node-1.redis-headless.database.svc.cluster.local:26379,
- redis-node-2.redis-headless.database.svc.cluster.local:26379
- db: 13
- master_name: redis-master
-
--- HelmRelease: observability/thanos ConfigMap: observability/thanos-ruler-configmap
+++ HelmRelease: observability/thanos ConfigMap: observability/thanos-ruler-configmap
@@ -1,24 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: thanos-ruler-configmap
- namespace: observability
- labels:
- app.kubernetes.io/instance: thanos
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/name: thanos
- app.kubernetes.io/component: ruler
-data:
- ruler.yml: |-
- groups:
- - name: PrometheusWatcher
- rules:
- - alert: PrometheusDown
- annotations:
- summary: A Prometheus has disappeared from Prometheus target discovery
- expr: absent(up{job="kube-prometheus-stack-prometheus"})
- for: 5m
- labels:
- severity: critical
-
--- HelmRelease: observability/thanos ConfigMap: observability/thanos-storegateway-configmap
+++ HelmRelease: observability/thanos ConfigMap: observability/thanos-storegateway-configmap
@@ -1,22 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: thanos-storegateway-configmap
- namespace: observability
- labels:
- app.kubernetes.io/instance: thanos
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/name: thanos
- app.kubernetes.io/component: storegateway
-data:
- config.yml: |-
- type: REDIS
- config:
- addr: >-
- redis-node-0.redis-headless.database.svc.cluster.local:26379,
- redis-node-1.redis-headless.database.svc.cluster.local:26379,
- redis-node-2.redis-headless.database.svc.cluster.local:26379
- db: 13
- master_name: redis-master
-
--- HelmRelease: observability/thanos Deployment: observability/thanos-bucketweb
+++ HelmRelease: observability/thanos Deployment: observability/thanos-bucketweb
@@ -24,13 +24,13 @@
labels:
app.kubernetes.io/instance: thanos
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: thanos
app.kubernetes.io/component: bucketweb
annotations:
- checksum/objstore-configuration: 37aa9e248f348a91644b8587628e6727a5f1885b9e28aa1f4bdbd70203400f39
+ checksum/objstore-configuration: 30650640084c9d295ef19d8c2463d3229d789880a6797687dbc41593d33afe3b
spec:
serviceAccountName: thanos-bucketweb
automountServiceAccountToken: true
affinity:
podAffinity: null
podAntiAffinity:
--- HelmRelease: observability/thanos Deployment: observability/thanos-compactor
+++ HelmRelease: observability/thanos Deployment: observability/thanos-compactor
@@ -24,13 +24,13 @@
labels:
app.kubernetes.io/instance: thanos
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: thanos
app.kubernetes.io/component: compactor
annotations:
- checksum/objstore-configuration: 37aa9e248f348a91644b8587628e6727a5f1885b9e28aa1f4bdbd70203400f39
+ checksum/objstore-configuration: 30650640084c9d295ef19d8c2463d3229d789880a6797687dbc41593d33afe3b
spec:
serviceAccountName: thanos-compactor
automountServiceAccountToken: true
affinity:
podAffinity: null
podAntiAffinity:
--- HelmRelease: observability/thanos Deployment: observability/thanos-query-frontend
+++ HelmRelease: observability/thanos Deployment: observability/thanos-query-frontend
@@ -24,13 +24,13 @@
labels:
app.kubernetes.io/instance: thanos
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: thanos
app.kubernetes.io/component: query-frontend
annotations:
- checksum/query-frontend-configuration: e50f6e0f1c3177b860accd4bb2905f78a69410162a29ab9eacc942474876e3aa
+ checksum/query-frontend-configuration: e2250442e59cde032e5beb8354c7b21be2ac84d24e819011680daa6f1831a632
spec:
serviceAccountName: thanos-query-frontend
automountServiceAccountToken: true
affinity:
podAffinity: null
podAntiAffinity:
@@ -66,18 +66,18 @@
seccompProfile:
type: RuntimeDefault
args:
- query-frontend
- --log.level=info
- --log.format=logfmt
- - --http-address=0.0.0.0:10902
+ - --http-address=0.0.0.0:9090
- --query-frontend.downstream-url=http://thanos-query:9090
- --query-range.response-cache-config-file=/conf/cache/config.yml
ports:
- name: http
- containerPort: 10902
+ containerPort: 9090
protocol: TCP
livenessProbe:
failureThreshold: 6
initialDelaySeconds: 30
periodSeconds: 10
successThreshold: 1
@@ -102,8 +102,8 @@
volumeMounts:
- name: cache-config
mountPath: /conf/cache
volumes:
- name: cache-config
configMap:
- name: thanos-query-frontend-configmap
+ name: thanos-query-frontend
--- HelmRelease: observability/thanos StatefulSet: observability/thanos-ruler
+++ HelmRelease: observability/thanos StatefulSet: observability/thanos-ruler
@@ -26,14 +26,14 @@
labels:
app.kubernetes.io/instance: thanos
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: thanos
app.kubernetes.io/component: ruler
annotations:
- checksum/objstore-configuration: 37aa9e248f348a91644b8587628e6727a5f1885b9e28aa1f4bdbd70203400f39
- checksum/ruler-configuration: c00eaaa83b0a15647733098ce2595853250453dbfaed6b24999f2288a8afbc07
+ checksum/objstore-configuration: 30650640084c9d295ef19d8c2463d3229d789880a6797687dbc41593d33afe3b
+ checksum/ruler-configuration: 204c5bbc92222475f3477be60437a398f1339becca6050f0950368624920f41c
spec:
serviceAccountName: thanos-ruler
automountServiceAccountToken: true
affinity:
podAffinity: null
podAntiAffinity:
@@ -127,13 +127,13 @@
mountPath: /conf/objstore
- name: data
mountPath: /data
volumes:
- name: ruler-config
configMap:
- name: thanos-ruler-configmap
+ name: thanos-ruler
- name: objstore-config
secret:
secretName: thanos-objstore-secret
volumeClaimTemplates:
- metadata:
name: data
--- HelmRelease: observability/thanos StatefulSet: observability/thanos-storegateway
+++ HelmRelease: observability/thanos StatefulSet: observability/thanos-storegateway
@@ -26,14 +26,14 @@
labels:
app.kubernetes.io/instance: thanos
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: thanos
app.kubernetes.io/component: storegateway
annotations:
- checksum/objstore-configuration: 37aa9e248f348a91644b8587628e6727a5f1885b9e28aa1f4bdbd70203400f39
- checksum/storegateway-configuration: 71446982e4b1c48f6cdbc8c90080c1d22142c59375b829e61e8b18511c2c946f
+ checksum/objstore-configuration: 30650640084c9d295ef19d8c2463d3229d789880a6797687dbc41593d33afe3b
+ checksum/storegateway-configuration: 0c8059e7c10f715c17bda648c0390c980d8be66e21fc5a3ad5e24bc80ff9546e
spec:
serviceAccountName: thanos-storegateway
automountServiceAccountToken: true
affinity:
podAffinity: null
podAntiAffinity:
@@ -117,13 +117,13 @@
volumes:
- name: objstore-config
secret:
secretName: thanos-objstore-secret
- name: cache-config
configMap:
- name: thanos-storegateway-configmap
+ name: thanos-storegateway
volumeClaimTemplates:
- metadata:
name: data
spec:
accessModes:
- ReadWriteOnce
--- HelmRelease: observability/thanos ConfigMap: observability/thanos-query-frontend
+++ HelmRelease: observability/thanos ConfigMap: observability/thanos-query-frontend
@@ -0,0 +1,22 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: thanos-query-frontend
+ namespace: observability
+ labels:
+ app.kubernetes.io/instance: thanos
+ app.kubernetes.io/managed-by: Helm
+ app.kubernetes.io/name: thanos
+ app.kubernetes.io/component: query-frontend
+data:
+ config.yml: |-
+ type: REDIS
+ config:
+ addr: >-
+ redis-node-0.redis-headless.database.svc.cluster.local:26379,
+ redis-node-1.redis-headless.database.svc.cluster.local:26379,
+ redis-node-2.redis-headless.database.svc.cluster.local:26379
+ db: 13
+ master_name: redis-master
+
--- HelmRelease: observability/thanos ConfigMap: observability/thanos-ruler
+++ HelmRelease: observability/thanos ConfigMap: observability/thanos-ruler
@@ -0,0 +1,24 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: thanos-ruler
+ namespace: observability
+ labels:
+ app.kubernetes.io/instance: thanos
+ app.kubernetes.io/managed-by: Helm
+ app.kubernetes.io/name: thanos
+ app.kubernetes.io/component: ruler
+data:
+ ruler.yml: |-
+ groups:
+ - name: PrometheusWatcher
+ rules:
+ - alert: PrometheusDown
+ annotations:
+ summary: A Prometheus has disappeared from Prometheus target discovery
+ expr: absent(up{job="kube-prometheus-stack-prometheus"})
+ for: 5m
+ labels:
+ severity: critical
+
--- HelmRelease: observability/thanos ConfigMap: observability/thanos-storegateway
+++ HelmRelease: observability/thanos ConfigMap: observability/thanos-storegateway
@@ -0,0 +1,22 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: thanos-storegateway
+ namespace: observability
+ labels:
+ app.kubernetes.io/instance: thanos
+ app.kubernetes.io/managed-by: Helm
+ app.kubernetes.io/name: thanos
+ app.kubernetes.io/component: storegateway
+data:
+ config.yml: |-
+ type: REDIS
+ config:
+ addr: >-
+ redis-node-0.redis-headless.database.svc.cluster.local:26379,
+ redis-node-1.redis-headless.database.svc.cluster.local:26379,
+ redis-node-2.redis-headless.database.svc.cluster.local:26379
+ db: 13
+ master_name: redis-master
+ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains the following updates:
12.23.1
->13.0.0
Configuration
π Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
π¦ Automerge: Disabled by config. Please merge this manually once you are satisfied.
β» Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
π Ignore: Close this PR and you won't be reminded about this update again.
This PR has been generated by Renovate Bot.