[rhobs]: Add rhobs query (#653)

* wip Signed-off-by: Thibault Mange <[email protected]> * update proxy volume name Signed-off-by: Thibault Mange <[email protected]> * fix useless controller port Signed-off-by: Thibault Mange <[email protected]> * changes hashrings file name Signed-off-by: Thibault Mange <[email protected]> * add query and query-rule Signed-off-by: Thibault Mange <[email protected]> * update observatorium commit Signed-off-by: Thibault Mange <[email protected]> * add req duration telemetry quantiles Signed-off-by: Thibault Mange <[email protected]> * make query rule common Signed-off-by: Thibault Mange <[email protected]> * upgrade thanos version Signed-off-by: Thibault Mange <[email protected]> --------- Signed-off-by: Thibault Mange <[email protected]>
rhobs · Nov 28, 2023 · 74df668 · 74df668
1 parent 1d711ff
commit 74df668
Show file tree

Hide file tree

Showing 23 changed files with 1,559 additions and 113 deletions.
diff --git a/go.mod b/go.mod
@@ -8,6 +8,7 @@ require (
 	github.com/observatorium/observatorium v0.0.0-00010101000000-000000000000
 	github.com/openshift/api v3.9.0+incompatible
 	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.68.0
+	github.com/prometheus/common v0.44.0
 	github.com/pyrra-dev/pyrra v0.7.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.28.2
@@ -50,7 +51,6 @@ require (
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_golang v1.16.0 // indirect
 	github.com/prometheus/client_model v0.4.0 // indirect
-	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/prometheus/prometheus v1.8.2-0.20220211202545-56e14463bccf // indirect
 	github.com/rodaine/hclencoder v0.0.1 // indirect
@@ -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-20231109122152-cc47e5be397b
+replace github.com/observatorium/observatorium => github.com/thibaultmg/observatorium v0.0.0-20231123172357-0705fe74fcd5
diff --git a/go.sum b/go.sum
@@ -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-20231109122152-cc47e5be397b h1:HDy/lsnObTgZgeNnq/ZUwQ+5unJdR4gvd3JOKMarQKM=
-github.com/thibaultmg/observatorium v0.0.0-20231109122152-cc47e5be397b/go.mod h1:P+7t9O8AitkuZjUhXC4LHw4iwAzTpIrs0tHz8X3xTvM=
+github.com/thibaultmg/observatorium v0.0.0-20231123172357-0705fe74fcd5 h1:EQ3Qb3hsVxrhlWKl3DWettTcHwKGbGyJp4t6j0q4W3E=
+github.com/thibaultmg/observatorium v0.0.0-20231123172357-0705fe74fcd5/go.mod h1:P+7t9O8AitkuZjUhXC4LHw4iwAzTpIrs0tHz8X3xTvM=
 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=

diff --git a/...rvices/app-sre-stage-01/rhobs/default/observatorium-metrics-compact-default-template.yaml b/...rvices/app-sre-stage-01/rhobs/default/observatorium-metrics-compact-default-template.yaml
@@ -15,7 +15,7 @@ objects:
       app.kubernetes.io/instance: observatorium
       app.kubernetes.io/name: thanos-compact
       app.kubernetes.io/part-of: observatorium
-      app.kubernetes.io/version: v0.32.4
+      app.kubernetes.io/version: v0.32.5
       observatorium/tenant: default
     name: observatorium-thanos-compact-default
     namespace: rhobs
@@ -46,7 +46,7 @@ objects:
       app.kubernetes.io/instance: observatorium
       app.kubernetes.io/name: thanos-compact
       app.kubernetes.io/part-of: observatorium
-      app.kubernetes.io/version: v0.32.4
+      app.kubernetes.io/version: v0.32.5
       observatorium/tenant: default
     name: observatorium-thanos-compact-default
     namespace: rhobs
@@ -59,7 +59,7 @@ objects:
       app.kubernetes.io/instance: observatorium
       app.kubernetes.io/name: thanos-compact
       app.kubernetes.io/part-of: observatorium
-      app.kubernetes.io/version: v0.32.4
+      app.kubernetes.io/version: v0.32.5
       observatorium/tenant: default
       prometheus: app-sre
     name: observatorium-thanos-compact-default
@@ -93,7 +93,7 @@ objects:
       app.kubernetes.io/instance: observatorium
       app.kubernetes.io/name: thanos-compact
       app.kubernetes.io/part-of: observatorium
-      app.kubernetes.io/version: v0.32.4
+      app.kubernetes.io/version: v0.32.5
       observatorium/tenant: default
     name: observatorium-thanos-compact-default
     namespace: rhobs
@@ -115,7 +115,7 @@ objects:
           app.kubernetes.io/instance: observatorium
           app.kubernetes.io/name: thanos-compact
           app.kubernetes.io/part-of: observatorium
-          app.kubernetes.io/version: v0.32.4
+          app.kubernetes.io/version: v0.32.5
           observatorium/tenant: default
         namespace: rhobs
       spec:
@@ -185,7 +185,7 @@ objects:
                   bucket: $(OBJ_STORE_BUCKET)
                   endpoint: $(OBJ_STORE_ENDPOINT)
                   region: $(OBJ_STORE_REGION)
-          image: quay.io/thanos/thanos:v0.32.4
+          image: quay.io/thanos/thanos:v0.32.5
           imagePullPolicy: IfNotPresent
           livenessProbe:
             failureThreshold: 4
@@ -247,14 +247,14 @@ objects:
           terminationMessagePolicy: FallbackToLogsOnError
           volumeMounts:
           - mountPath: /etc/tls/private
-            name: compact-tls
+            name: tls
             readOnly: true
         nodeSelector:
           kubernetes.io/os: linux
         serviceAccountName: observatorium-thanos-compact-default
         terminationGracePeriodSeconds: 120
         volumes:
-        - name: compact-tls
+        - name: tls
           secret:
             secretName: compact-tls-default
     updateStrategy: {}
@@ -266,7 +266,7 @@ objects:
           app.kubernetes.io/instance: observatorium
           app.kubernetes.io/name: thanos-compact
           app.kubernetes.io/part-of: observatorium
-          app.kubernetes.io/version: v0.32.4
+          app.kubernetes.io/version: v0.32.5
           observatorium/tenant: default
         name: data
       spec:

diff --git a/...p-sre-stage-01/rhobs/default/observatorium-metrics-receive-ingestor-default-template.yaml b/...p-sre-stage-01/rhobs/default/observatorium-metrics-receive-ingestor-default-template.yaml
@@ -13,7 +13,7 @@ objects:
       app.kubernetes.io/instance: observatorium
       app.kubernetes.io/name: thanos-receive-ingestor
       app.kubernetes.io/part-of: observatorium
-      app.kubernetes.io/version: v0.32.4
+      app.kubernetes.io/version: v0.32.5
       observatorium/tenant: default
     name: observatorium-thanos-receive-ingestor-default
     namespace: rhobs
@@ -48,7 +48,7 @@ objects:
       app.kubernetes.io/instance: observatorium
       app.kubernetes.io/name: thanos-receive-ingestor
       app.kubernetes.io/part-of: observatorium
-      app.kubernetes.io/version: v0.32.4
+      app.kubernetes.io/version: v0.32.5
       observatorium/tenant: default
     name: observatorium-thanos-receive-ingestor-default
     namespace: rhobs
@@ -61,7 +61,7 @@ objects:
       app.kubernetes.io/instance: observatorium
       app.kubernetes.io/name: thanos-receive-ingestor
       app.kubernetes.io/part-of: observatorium
-      app.kubernetes.io/version: v0.32.4
+      app.kubernetes.io/version: v0.32.5
       observatorium/tenant: default
       prometheus: app-sre
     name: observatorium-thanos-receive-ingestor-default
@@ -95,7 +95,7 @@ objects:
       app.kubernetes.io/instance: observatorium
       app.kubernetes.io/name: thanos-receive-ingestor
       app.kubernetes.io/part-of: observatorium
-      app.kubernetes.io/version: v0.32.4
+      app.kubernetes.io/version: v0.32.5
       controller.receive.thanos.io: thanos-receive-controller
       controller.receive.thanos.io/hashring: default
       observatorium/tenant: default
@@ -119,7 +119,7 @@ objects:
           app.kubernetes.io/instance: observatorium
           app.kubernetes.io/name: thanos-receive-ingestor
           app.kubernetes.io/part-of: observatorium
-          app.kubernetes.io/version: v0.32.4
+          app.kubernetes.io/version: v0.32.5
           observatorium/tenant: default
         namespace: rhobs
       spec:
@@ -193,7 +193,7 @@ objects:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.name
-          image: quay.io/thanos/thanos:v0.32.4
+          image: quay.io/thanos/thanos:v0.32.5
           imagePullPolicy: IfNotPresent
           livenessProbe:
             failureThreshold: 8
@@ -286,7 +286,7 @@ objects:
           app.kubernetes.io/instance: observatorium
           app.kubernetes.io/name: thanos-receive-ingestor
           app.kubernetes.io/part-of: observatorium
-          app.kubernetes.io/version: v0.32.4
+          app.kubernetes.io/version: v0.32.5
           observatorium/tenant: default
         name: data
       spec:

diff --git a/...services/app-sre-stage-01/rhobs/default/observatorium-metrics-store-default-template.yaml b/...services/app-sre-stage-01/rhobs/default/observatorium-metrics-store-default-template.yaml
@@ -452,7 +452,7 @@ objects:
       app.kubernetes.io/instance: observatorium
       app.kubernetes.io/name: thanos-store
       app.kubernetes.io/part-of: observatorium
-      app.kubernetes.io/version: v0.32.4
+      app.kubernetes.io/version: v0.32.5
       observatorium/tenant: default
     name: hashmod-config-template-default
     namespace: rhobs
@@ -486,7 +486,7 @@ objects:
       app.kubernetes.io/instance: observatorium
       app.kubernetes.io/name: thanos-store
       app.kubernetes.io/part-of: observatorium
-      app.kubernetes.io/version: v0.32.4
+      app.kubernetes.io/version: v0.32.5
       observatorium/tenant: default
     name: observatorium-thanos-store-default
     namespace: rhobs
@@ -517,7 +517,7 @@ objects:
       app.kubernetes.io/instance: observatorium
       app.kubernetes.io/name: thanos-store
       app.kubernetes.io/part-of: observatorium
-      app.kubernetes.io/version: v0.32.4
+      app.kubernetes.io/version: v0.32.5
       observatorium/tenant: default
     name: observatorium-thanos-store-default
     namespace: rhobs
@@ -530,7 +530,7 @@ objects:
       app.kubernetes.io/instance: observatorium
       app.kubernetes.io/name: thanos-store
       app.kubernetes.io/part-of: observatorium
-      app.kubernetes.io/version: v0.32.4
+      app.kubernetes.io/version: v0.32.5
       observatorium/tenant: default
       prometheus: app-sre
     name: observatorium-thanos-store-default
@@ -564,7 +564,7 @@ objects:
       app.kubernetes.io/instance: observatorium
       app.kubernetes.io/name: thanos-store
       app.kubernetes.io/part-of: observatorium
-      app.kubernetes.io/version: v0.32.4
+      app.kubernetes.io/version: v0.32.5
       observatorium/tenant: default
     name: observatorium-thanos-store-default
     namespace: rhobs
@@ -586,7 +586,7 @@ objects:
           app.kubernetes.io/instance: observatorium
           app.kubernetes.io/name: thanos-store
           app.kubernetes.io/part-of: observatorium
-          app.kubernetes.io/version: v0.32.4
+          app.kubernetes.io/version: v0.32.5
           observatorium/tenant: default
         namespace: rhobs
       spec:
@@ -691,7 +691,7 @@ objects:
                   bucket: $(OBJ_STORE_BUCKET)
                   endpoint: $(OBJ_STORE_ENDPOINT)
                   region: $(OBJ_STORE_REGION)
-          image: quay.io/thanos/thanos:v0.32.4
+          image: quay.io/thanos/thanos:v0.32.5
           imagePullPolicy: IfNotPresent
           livenessProbe:
             failureThreshold: 8
@@ -806,7 +806,7 @@ objects:
           app.kubernetes.io/instance: observatorium
           app.kubernetes.io/name: thanos-store
           app.kubernetes.io/part-of: observatorium
-          app.kubernetes.io/version: v0.32.4
+          app.kubernetes.io/version: v0.32.5
           observatorium/tenant: default
         name: data
       spec: