cluster

commit 69b865233ca805e7d867a22f1cd4a943bde783cf
parent 036dcf86b430417aa42b92c4cf5e64acac82291e
Author: MTRNord <mtrnord1@gmail.com>
Date:   Tue,  6 Jun 2023 20:12:42 +0200

Be smarter about rules

Diffstat:
M
apps/production/kube-prometheus-stack-values.yaml
 | 
46
++++++++++++++++++++++++++--------------------

1 file changed, 26 insertions(+), 20 deletions(-)
diff --git a/apps/production/kube-prometheus-stack-values.yaml b/apps/production/kube-prometheus-stack-values.yaml
@@ -17,9 +17,9 @@ spec:
               rules:
                 - uid: b6db960c-c0bd-4d4f-b0f1-e1f216ec81cc
                   title: DNSQueryRefusedError
-                  condition: C
+                  condition: Thresh
                   data:
-                    - refId: A
+                    - refId: Count
                       queryType: range
                       relativeTimeRange:
                         from: 600
@@ -28,14 +28,16 @@ spec:
                       model:
                         datasource:
                             type: loki
-                        editorMode: code
-                        expr: count(rate({namespace="matrix", app="matrix-synapse"} |= `DNSQueryRefusedError` [$__interval]))
+                            uid: loki
+                        editorMode: builder
+                        expr: count_over_time({namespace="matrix", app="matrix-synapse"} |= `DNSQueryRefusedError` [15m])
                         hide: false
                         intervalMs: 1000
                         maxDataPoints: 43200
                         queryType: range
-                        refId: A
-                    - refId: B
+                        range: true
+                        refId: Count
+                    - refId: Thresh
                       relativeTimeRange:
                         from: 600
                         to: 0
@@ -43,13 +45,14 @@ spec:
                       model:
                         conditions:
                             - evaluator:
-                                params: []
+                                params:
+                                    - 1
                                 type: gt
                               operator:
                                 type: and
                               query:
                                 params:
-                                    - B
+                                    - C
                               reducer:
                                 params: []
                                 type: last
@@ -61,10 +64,9 @@ spec:
                         hide: false
                         intervalMs: 1000
                         maxDataPoints: 43200
-                        reducer: mean
-                        refId: B
-                        type: reduce
-                    - refId: C
+                        refId: Thresh
+                        type: threshold
+                    - refId: A
                       relativeTimeRange:
                         from: 600
                         to: 0
@@ -73,26 +75,30 @@ spec:
                         conditions:
                             - evaluator:
                                 params:
-                                    - 1
+                                    - 0
+                                    - 0
                                 type: gt
                               operator:
                                 type: and
                               query:
-                                params:
-                                    - C
+                                params: []
                               reducer:
                                 params: []
-                                type: last
+                                type: avg
                               type: query
                         datasource:
+                            name: Expression
                             type: __expr__
                             uid: __expr__
-                        expression: B
-                        hide: false
+                        expression: Count
                         intervalMs: 1000
                         maxDataPoints: 43200
-                        refId: C
-                        type: threshold
+                        reducer: mean
+                        refId: A
+                        settings:
+                            mode: replaceNN
+                            replaceWithValue: 0
+                        type: reduce
                   noDataState: NoData
                   execErrState: Error
                   for: 5m