Skip to content

Commit d35cd79

Browse files
bastianeicherbastianeicher
committed
Moved "alerting.logs" values after all other "alerting" values
1 parent 1f0db38 commit d35cd79

File tree

3 files changed

+65
-65
lines changed

3 files changed

+65
-65
lines changed

‎charts/generic-service/README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,13 +166,6 @@ app:
166166
| `alerting.grpc.errorDuration` | | The duration for which the gRPC error rate has to remain elevated before triggering an alert |
167167
| `alerting.grpc.maxCriticalErrors` | `0` | The maximum number of critical gRPC errors responses in the sample interval |
168168
| `alerting.grpc.criticalCodes` | `[Internal, Unimplemented]` | Which gRPC status codes are considered critical errors |
169-
| `alerting.logs.countInterval` | `5m` | The time interval in which to count the number of messages per log level |
170-
| `alerting.logs.levelLabel` | `level` | The Loki label containing the log level |
171-
| `alerting.logs.levels.*.maxCount` | `0` | The maximum number of messages of a specific log level in the interval to allow before alerting |
172-
| `alerting.logs.levels.*.severity` | `warning` | The severity of the alert when the maximum count of a messages of a specific log level is exceeded |
173-
| `alerting.logs.levels.lokiConfigMap.label` | `loki_rule` | The label attached to the ConfigMap holding the Loki Rules |
174-
| `alerting.logs.levels.lokiConfigMap.labelValue` | `""` | The value of the label attached to the Loki Rule ConfigMap |
175-
| `alerting.logs.createLokiRule` | `false` | Whether to create a `LokiRule` custom resource of a ConfigMap for log alerting |
176169
| `alerting.custom.*.metric` | __required if used__ | The name of the Prometheus metric exposed by the service |
177170
| `alerting.custom.*.labelMatchers` | | Prometheus label matchers to use for filtering the metric (e.g., `some_key="some_value"`) |
178171
| `alerting.custom.*.aggregate` | __required if used__ | The aggregate function to use to combine metric values from multiple replicas (e.g., `max` or `sum`) |
@@ -184,6 +177,13 @@ app:
184177
| `alerting.custom.*.topic` | | The `topic` label for the alert |
185178
| `alerting.custom.*.summary` | __required if used__ | A short summary of the alert |
186179
| `alerting.custom.*.description` | __required if used__ | A longer description of the alert; can include metric labels via templating |
180+
| `alerting.logs.countInterval` | `5m` | The time interval in which to count the number of messages per log level |
181+
| `alerting.logs.levelLabel` | `level` | The Loki label containing the log level |
182+
| `alerting.logs.levels.*.maxCount` | `0` | The maximum number of messages of a specific log level in the interval to allow before alerting |
183+
| `alerting.logs.levels.*.severity` | `warning` | The severity of the alert when the maximum count of a messages of a specific log level is exceeded |
184+
| `alerting.logs.levels.lokiConfigMap.label` | `loki_rule` | The label attached to the ConfigMap holding the Loki Rules |
185+
| `alerting.logs.levels.lokiConfigMap.labelValue` | `""` | The value of the label attached to the Loki Rule ConfigMap |
186+
| `alerting.logs.createLokiRule` | `false` | Whether to create a `LokiRule` custom resource of a ConfigMap for log alerting |
187187
| `sidecars` | `[]` | Additional sidecar containers to be added to the `Pod` |
188188
| `sidecarTemplates` | `[]` | Strings to be templated providing additional sidecar containers to be added to the Pod |
189189
| `initContainers` | `[]` | Additional init containers to be added to the `Pod` |

‎charts/generic-service/values.schema.json‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -941,63 +941,6 @@
941941
},
942942
"additionalProperties": false
943943
},
944-
"logs": {
945-
"type": "object",
946-
"properties": {
947-
"countInterval": {
948-
"type": "string",
949-
"default": "5m",
950-
"description": "The time interval in which to count the number of messages per log level"
951-
},
952-
"levelLabel": {
953-
"type": "string",
954-
"default": "level",
955-
"description": "The Loki label containing the log level"
956-
},
957-
"levels": {
958-
"type": "object",
959-
"additionalProperties": {
960-
"type": "object",
961-
"properties": {
962-
"maxCount": {
963-
"type": "integer",
964-
"default": 0,
965-
"description": "The maximum number of messages in the interval to allow before alerting"
966-
},
967-
"severity": {
968-
"type": "string",
969-
"default": "warning",
970-
"description": "The severity of the alert when the maximum count of a messages is exceeded"
971-
}
972-
},
973-
"additionalProperties": false
974-
},
975-
"description": "Alerts for messages of specific log levels"
976-
},
977-
"lokiConfigMap": {
978-
"type": "object",
979-
"properties": {
980-
"label": {
981-
"type": "string",
982-
"default": "loki_rule",
983-
"description": "The label attached to the ConfigMap holding the Loki Rules"
984-
},
985-
"labelValue": {
986-
"type": "string",
987-
"default": "",
988-
"description": "The value of the label attached to the Loki Rule ConfigMap"
989-
}
990-
},
991-
"additionalProperties": false
992-
},
993-
"createLokiRule": {
994-
"type": "boolean",
995-
"default": false,
996-
"description": "Whether to create a LokiRule custom resource instead of a ConfigMap for log alerting"
997-
}
998-
},
999-
"additionalProperties": false
1000-
},
1001944
"custom": {
1002945
"type": "object",
1003946
"additionalProperties": {
@@ -1055,6 +998,63 @@
1055998
},
1056999
"description": "Additional alerts based on Prometheus metrics exposed by the service"
10571000
},
1001+
"logs": {
1002+
"type": "object",
1003+
"properties": {
1004+
"countInterval": {
1005+
"type": "string",
1006+
"default": "5m",
1007+
"description": "The time interval in which to count the number of messages per log level"
1008+
},
1009+
"levelLabel": {
1010+
"type": "string",
1011+
"default": "level",
1012+
"description": "The Loki label containing the log level"
1013+
},
1014+
"levels": {
1015+
"type": "object",
1016+
"additionalProperties": {
1017+
"type": "object",
1018+
"properties": {
1019+
"maxCount": {
1020+
"type": "integer",
1021+
"default": 0,
1022+
"description": "The maximum number of messages in the interval to allow before alerting"
1023+
},
1024+
"severity": {
1025+
"type": "string",
1026+
"default": "warning",
1027+
"description": "The severity of the alert when the maximum count of a messages is exceeded"
1028+
}
1029+
},
1030+
"additionalProperties": false
1031+
},
1032+
"description": "Alerts for messages of specific log levels"
1033+
},
1034+
"lokiConfigMap": {
1035+
"type": "object",
1036+
"properties": {
1037+
"label": {
1038+
"type": "string",
1039+
"default": "loki_rule",
1040+
"description": "The label attached to the ConfigMap holding the Loki Rules"
1041+
},
1042+
"labelValue": {
1043+
"type": "string",
1044+
"default": "",
1045+
"description": "The value of the label attached to the Loki Rule ConfigMap"
1046+
}
1047+
},
1048+
"additionalProperties": false
1049+
},
1050+
"createLokiRule": {
1051+
"type": "boolean",
1052+
"default": false,
1053+
"description": "Whether to create a LokiRule custom resource instead of a ConfigMap for log alerting"
1054+
}
1055+
},
1056+
"additionalProperties": false
1057+
},
10581058
"additionalProperties": false
10591059
}
10601060
},

‎charts/generic-service/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ alerting:
181181
maxErrorRatio: 2.5
182182
maxCriticalErrors: 0
183183
criticalCodes: [Internal, Unimplemented]
184+
custom: {}
184185
logs:
185186
countInterval: 5m
186187
levelLabel: level
@@ -189,7 +190,6 @@ alerting:
189190
lokiConfigMap:
190191
label: "loki_rule"
191192
labelValue: ""
192-
custom: {}
193193

194194
initContainers: []
195195
initContainerTemplates: []

0 commit comments

Comments
 (0)