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

Jump to bottom

feat: do not create LokiRule by default #38

Merged
merged 1 commit into from
Jan 15, 2024
+5 −4
Merged

feat: do not create LokiRule by default #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion charts/generic-service/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`) |
Expand Down
1 change: 1 addition & 0 deletions charts/generic-service/ci/log-alerts-both-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ alerting:
severity: Warning
maxCount: 10
error: {}
createLokiRule: true
lokiConfigMap:
label: "loki_rule"
labelValue: ""
1 change: 1 addition & 0 deletions charts/generic-service/ci/log-alerts-operator-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ alerting:
error: {}
# setting this to an empty object (`{}`) will not suppress cm creation, use `null` instead
lokiConfigMap: null
createLokiRule: true
1 change: 0 additions & 1 deletion charts/generic-service/ci/log-alerts-sidecar-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@ alerting:
lokiConfigMap:
label: "loki_rule"
labelValue: ""
createLokiRule: false
2 changes: 1 addition & 1 deletion charts/generic-service/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,7 @@
},
"createLokiRule": {
"type": "boolean",
"default": true,
"default": false,
smauermann marked this conversation as resolved.
Show resolved Hide resolved
"description": "Whether to create a LokiRule CR for log alerting or not."
}
},
Expand Down
2 changes: 1 addition & 1 deletion charts/generic-service/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ alerting:
countInterval: 5m
levelLabel: level
levels: {}
createLokiRule: true
createLokiRule: false
lokiConfigMap:
label: "loki_rule"
labelValue: ""
Expand Down