Skip to content

Commit

Permalink
Moved "alerting.logs" values after all other "alerting" values
Browse files Browse the repository at this point in the history
  • Loading branch information
@bastianeicher
bastianeicher committed Jul 10, 2024
1 parent 1f0db38 commit d35cd79
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 65 deletions.
14 changes: 7 additions & 7 deletions charts/generic-service/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,6 @@ app:
| `alerting.grpc.errorDuration` | | The duration for which the gRPC error rate has to remain elevated before triggering an alert |
| `alerting.grpc.maxCriticalErrors` | `0` | The maximum number of critical gRPC errors responses in the sample interval |
| `alerting.grpc.criticalCodes` | `[Internal, Unimplemented]` | Which gRPC status codes are considered critical errors |
| `alerting.logs.countInterval` | `5m` | The time interval in which to count the number of messages per log level |
| `alerting.logs.levelLabel` | `level` | The Loki label containing the log level |
| `alerting.logs.levels.*.maxCount` | `0` | The maximum number of messages of a specific log level in the interval to allow before alerting |
| `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.createLokiRule` | `false` | Whether to create a `LokiRule` custom resource of a ConfigMap for log alerting |
| `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 All @@ -184,6 +177,13 @@ app:
| `alerting.custom.*.topic` | | The `topic` label for the alert |
| `alerting.custom.*.summary` | __required if used__ | A short summary of the alert |
| `alerting.custom.*.description` | __required if used__ | A longer description of the alert; can include metric labels via templating |
| `alerting.logs.countInterval` | `5m` | The time interval in which to count the number of messages per log level |
| `alerting.logs.levelLabel` | `level` | The Loki label containing the log level |
| `alerting.logs.levels.*.maxCount` | `0` | The maximum number of messages of a specific log level in the interval to allow before alerting |
| `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.createLokiRule` | `false` | Whether to create a `LokiRule` custom resource of a ConfigMap for log alerting |
| `sidecars` | `[]` | Additional sidecar containers to be added to the `Pod` |
| `sidecarTemplates` | `[]` | Strings to be templated providing additional sidecar containers to be added to the Pod |
| `initContainers` | `[]` | Additional init containers to be added to the `Pod` |
Expand Down
114 changes: 57 additions & 57 deletions charts/generic-service/values.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -941,63 +941,6 @@
},
"additionalProperties": false
},
"logs": {
"type": "object",
"properties": {
"countInterval": {
"type": "string",
"default": "5m",
"description": "The time interval in which to count the number of messages per log level"
},
"levelLabel": {
"type": "string",
"default": "level",
"description": "The Loki label containing the log level"
},
"levels": {
"type": "object",
"additionalProperties": {
"type": "object",
"properties": {
"maxCount": {
"type": "integer",
"default": 0,
"description": "The maximum number of messages in the interval to allow before alerting"
},
"severity": {
"type": "string",
"default": "warning",
"description": "The severity of the alert when the maximum count of a messages is exceeded"
}
},
"additionalProperties": false
},
"description": "Alerts for messages of specific log levels"
},
"lokiConfigMap": {
"type": "object",
"properties": {
"label": {
"type": "string",
"default": "loki_rule",
"description": "The label attached to the ConfigMap holding the Loki Rules"
},
"labelValue": {
"type": "string",
"default": "",
"description": "The value of the label attached to the Loki Rule ConfigMap"
}
},
"additionalProperties": false
},
"createLokiRule": {
"type": "boolean",
"default": false,
"description": "Whether to create a LokiRule custom resource instead of a ConfigMap for log alerting"
}
},
"additionalProperties": false
},
"custom": {
"type": "object",
"additionalProperties": {
Expand Down Expand Up @@ -1055,6 +998,63 @@
},
"description": "Additional alerts based on Prometheus metrics exposed by the service"
},
"logs": {
"type": "object",
"properties": {
"countInterval": {
"type": "string",
"default": "5m",
"description": "The time interval in which to count the number of messages per log level"
},
"levelLabel": {
"type": "string",
"default": "level",
"description": "The Loki label containing the log level"
},
"levels": {
"type": "object",
"additionalProperties": {
"type": "object",
"properties": {
"maxCount": {
"type": "integer",
"default": 0,
"description": "The maximum number of messages in the interval to allow before alerting"
},
"severity": {
"type": "string",
"default": "warning",
"description": "The severity of the alert when the maximum count of a messages is exceeded"
}
},
"additionalProperties": false
},
"description": "Alerts for messages of specific log levels"
},
"lokiConfigMap": {
"type": "object",
"properties": {
"label": {
"type": "string",
"default": "loki_rule",
"description": "The label attached to the ConfigMap holding the Loki Rules"
},
"labelValue": {
"type": "string",
"default": "",
"description": "The value of the label attached to the Loki Rule ConfigMap"
}
},
"additionalProperties": false
},
"createLokiRule": {
"type": "boolean",
"default": false,
"description": "Whether to create a LokiRule custom resource instead of a ConfigMap for log alerting"
}
},
"additionalProperties": false
},
"additionalProperties": false
}
},
Expand Down
2 changes: 1 addition & 1 deletion charts/generic-service/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ alerting:
maxErrorRatio: 2.5
maxCriticalErrors: 0
criticalCodes: [Internal, Unimplemented]
custom: {}
logs:
countInterval: 5m
levelLabel: level
Expand All @@ -189,7 +190,6 @@ alerting:
lokiConfigMap:
label: "loki_rule"
labelValue: ""
custom: {}

initContainers: []
initContainerTemplates: []
Expand Down

0 comments on commit d35cd79

Please sign in to comment.