From 854c978780c94b21c25c78937821a212e966a748 Mon Sep 17 00:00:00 2001
From: Stephan Mauermann <stephan.mauermann@deepl.com>
Date: Mon, 15 Jan 2024 11:41:10 +0100
Subject: [PATCH] feat: do not create LokiRule by default

---
 charts/generic-service/README.md                          | 2 +-
 charts/generic-service/ci/log-alerts-both-values.yaml     | 1 +
 charts/generic-service/ci/log-alerts-operator-values.yaml | 1 +
 charts/generic-service/ci/log-alerts-sidecar-values.yaml  | 1 -
 charts/generic-service/values.schema.json                 | 2 +-
 charts/generic-service/values.yaml                        | 2 +-
 6 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/charts/generic-service/README.md b/charts/generic-service/README.md
index f12b42d..c474cb7 100644
--- a/charts/generic-service/README.md
+++ b/charts/generic-service/README.md
@@ -165,7 +165,7 @@ app:
 | `alerting.logs.levels.*.severity`               | `warning`                   | The severity of the alert when the maximum count of a messages of a specific log level is exceeded       |
 | `alerting.logs.levels.lokiConfigMap.label`      | `loki_rule`                 | The label attached to the ConfigMap holding the Loki Rules                                               |
 | `alerting.logs.levels.lokiConfigMap.labelValue` | `""`                        | The value of the label attached to the Loki Rule ConfigMap                                               |
-| `alerting.logs.levels.createLokiRule`           | `true`                      | Whether to create a LokiRule CR or not (useful when transitioning from loki-rule-operator)               |
+| `alerting.logs.levels.createLokiRule`           | `false`                     | Whether to create a LokiRule CR or not (useful when transitioning from loki-rule-operator)               |
 | `alerting.custom.*.metric`                      | __required if used__        | The name of the Prometheus metric exposed by the service                                                 |
 | `alerting.custom.*.labelMatchers`               |                             | Prometheus label matchers to use for filtering the metric (e.g., `some_key="some_value"`)                |
 | `alerting.custom.*.aggregate`                   | __required if used__        | The aggregate function to use to combine metric values from multiple replicas (e.g., `max` or `sum`)     |
diff --git a/charts/generic-service/ci/log-alerts-both-values.yaml b/charts/generic-service/ci/log-alerts-both-values.yaml
index 6adce8f..b32e29e 100644
--- a/charts/generic-service/ci/log-alerts-both-values.yaml
+++ b/charts/generic-service/ci/log-alerts-both-values.yaml
@@ -12,6 +12,7 @@ alerting:
         severity: Warning
         maxCount: 10
       error: {}
+    createLokiRule: true
     lokiConfigMap:
       label: "loki_rule"
       labelValue: ""
diff --git a/charts/generic-service/ci/log-alerts-operator-values.yaml b/charts/generic-service/ci/log-alerts-operator-values.yaml
index 2b02966..f4acbbf 100644
--- a/charts/generic-service/ci/log-alerts-operator-values.yaml
+++ b/charts/generic-service/ci/log-alerts-operator-values.yaml
@@ -14,3 +14,4 @@ alerting:
       error: {}
     # setting this to an empty object (`{}`) will not suppress cm creation, use `null` instead
     lokiConfigMap: null
+    createLokiRule: true
diff --git a/charts/generic-service/ci/log-alerts-sidecar-values.yaml b/charts/generic-service/ci/log-alerts-sidecar-values.yaml
index f2e2cba..6adce8f 100644
--- a/charts/generic-service/ci/log-alerts-sidecar-values.yaml
+++ b/charts/generic-service/ci/log-alerts-sidecar-values.yaml
@@ -15,4 +15,3 @@ alerting:
     lokiConfigMap:
       label: "loki_rule"
       labelValue: ""
-    createLokiRule: false
diff --git a/charts/generic-service/values.schema.json b/charts/generic-service/values.schema.json
index 0b52473..b07fcf8 100644
--- a/charts/generic-service/values.schema.json
+++ b/charts/generic-service/values.schema.json
@@ -956,7 +956,7 @@
             },
             "createLokiRule": {
               "type": "boolean",
-              "default": true,
+              "default": false,
               "description": "Whether to create a LokiRule CR for log alerting or not."
             }
           },
diff --git a/charts/generic-service/values.yaml b/charts/generic-service/values.yaml
index 73cf1e8..23a9160 100644
--- a/charts/generic-service/values.yaml
+++ b/charts/generic-service/values.yaml
@@ -179,7 +179,7 @@ alerting:
     countInterval: 5m
     levelLabel: level
     levels: {}
-    createLokiRule: true
+    createLokiRule: false
     lokiConfigMap:
       label: "loki_rule"
       labelValue: ""