Skip to content

Commit 23b446c

Browse files
Merge pull request #7204 from GeorgianaElena/fiddle-with-pagers
Add a new pvc-outage alertmanager receiver
2 parents 9d2fc06 + a766465 commit 23b446c

File tree

2 files changed

+27
-7
lines changed

2 files changed

+27
-7
lines changed

helm-charts/support/enc-support.secret.values.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ prometheus:
77
- name: ENC[AES256_GCM,data:07mFH5D36H9XR9yGkLJM,iv:jQgUKCV/lWeT1qGICj1/961tgSjSDOio1dk+ybWboyc=,tag:/DLa17ekhqBbjNLzbdb4hg==,type:str]
88
pagerduty_configs:
99
- routing_key: ENC[AES256_GCM,data:wecu/x0cTsUODGxoDbIh35sPvZI5NyMxtKeM3Hrvyno=,iv:IdZQ6BPbzXGO+evAlYB50G8fxgLajIPWu0utRovYxpk=,tag:V451xfOWo4bDyOhFfa31mw==,type:str]
10-
- name: ENC[AES256_GCM,data:z5nrLx65s+HYdStl2GnXJrP0npKn0ZP8,iv:H7AKr/Hk/aWoSAeZWGls+zsRCM2xjCvQBYcnnG9Xzsg=,tag:O2DckmmvSoxnTocxIviC/g==,type:str]
10+
- name: ENC[AES256_GCM,data:iEMiTUTCYxdVWag3O7Zn8lfALbi0sxYU/jk=,iv:3fpZdP4wMyZLycvh75a6zXNmudXR+SF6rbD3PLozhc0=,tag:Hmfz+bji/tUYkUkVB0nrhQ==,type:str]
1111
pagerduty_configs:
12-
- routing_key: ENC[AES256_GCM,data:BxX0s1YTUO/h4O6dUs58TsAZkxqwNDMyeYx4bzuJifk=,iv:qTLH5bteyUEXvduIVzy5GtdLv+3GDBHwhj2VAs0+bQ4=,tag:sSgBts/RsWUOoifuJYevPg==,type:str]
13-
send_resolved: ENC[AES256_GCM,data:ZpteoqQ=,iv:0TrJjEF7tB2BrhbN2QAoHY3JssCr2NksfycYI6I9zyM=,tag:3zjKfmsMaycpnRrpwTKbLg==,type:bool]
12+
- routing_key: ENC[AES256_GCM,data:9vUBomoVOIyvWv/5BCppAc5FWrib2+dm4U+5iY9tIUA=,iv:yX7BbeCvaD7wc6KAQvACJxHw4h4PXdbvHXHf/Rr0H40=,tag:EBfMsgePe62iKBFdtpDniw==,type:str]
1413
- name: ENC[AES256_GCM,data:3H1uE0zM5/dTpnjrJOOhdznBziZlNPBl,iv:o0oqunEPVep9txxxlqrdeTqwQJKC9tYOpa6piTg8RWw=,tag:nq9tBEFGhgFwF2hR1v0ZqQ==,type:str]
1514
pagerduty_configs:
1615
- routing_key: ENC[AES256_GCM,data:D2JPkGj8Ai6pa+0K78f4IeVIpwPAI+uh77JTMp0Mt04=,iv:G2GWWp7IXWV+m//CjYe134wnWuEQiJHxDehKmN59UyY=,tag:JoBVxQrCrL4sF/5bBmautA==,type:str]
@@ -27,7 +26,7 @@ sops:
2726
- resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
2827
created_at: "2024-12-18T10:09:21Z"
2928
enc: CiUA4OM7eOThrN3NqDXYd4belMxUdYfF8XpeUSYfiefKkYutN2KoEkkAnGhyNqzzrXyUXTvtS4xl4IjlJpo6hwm9FVbQAyh2Vw9dcXH6h1+NNUHGPYj6KQJvvWZzgXHFLiWdqOfUgTJME0YDx/DYgXgm
30-
lastmodified: "2025-09-09T18:53:04Z"
31-
mac: ENC[AES256_GCM,data:0O0krdj8krVKq0uwlLJhfvRG/phcQRyh/hYkpVV90t0QCvEa+zH2sfRYZrFL3ZvB20Qf9eqQiZloCiOzLP06hcoJGqjPnq+gR4aKvRIaPkmbopg3l6frxaUxiFg+fAvQ53AUtumDnCnN0XHlu95UOKiOfMTRCgIrWfxquZ7gR/Y=,iv:G++9Q+w7o5z1uiCCclg9W+W2rxTrkVTBV8Cp/ZrCbhM=,tag:Xm/d3VnX4u5k6pHeM4nH7w==,type:str]
29+
lastmodified: "2025-11-27T14:44:45Z"
30+
mac: ENC[AES256_GCM,data:c4fhwv0CejF1CdFQj4xqf9RGmxpgMpBtB5whKBzA80+7i1nWGmgRBdKhauiOmFj48BZBpvKpknoq4Mx3aZrlW+2wSCYXtCKfmJOYkpo5Je6QpyuA0IhhNxrk6M+svMBWauC252cIyp7beDWj9/OtxtQzyOLt8tsduxYGhnTaOBo=,iv:/Yav3UoGeaIpHuv/LKErrQ1cbkUX1DXveqDpK9QK7JI=,tag:41c0NCYVY5c1g/BTfORIDw==,type:str]
3231
unencrypted_suffix: _unencrypted
3332
version: 3.10.2

helm-charts/support/values.jsonnet

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,15 @@ function(VARS_2I2C_AWS_ACCOUNT_ID=null)
154154
],
155155
repeat_interval: '3h',
156156
routes: [
157+
{
158+
receiver: 'known-storage-outage-pager',
159+
matchers: [
160+
'cluster =~ .*',
161+
'alertname =~ ".*0% of space left.*"',
162+
],
163+
// if this one matches, don't check sub-sequent routes
164+
continue: false,
165+
},
157166
{
158167
receiver: 'persistent-storage-pager',
159168
matchers: [
@@ -186,13 +195,13 @@ function(VARS_2I2C_AWS_ACCOUNT_ID=null)
186195
name: 'PVC available capacity',
187196
rules: [
188197
makePVCApproachingFullAlert(
189-
'Take action! Home Directory Disk very close to full: cluster:%s hub:{{ $labels.namespace }}' % [cluster_name],
198+
'Home Directory Disk very close to full: cluster:%s hub:{{ $labels.namespace }}' % [cluster_name],
190199
'home-nfs',
191200
10,
192201
'same day action needed',
193202
),
194203
makePVCApproachingFullAlert(
195-
'Take action! Home Directory Disk very close to full: cluster:%s hub:{{ $labels.namespace }}' % [cluster_name],
204+
'Home Directory Disk is full: cluster:%s hub:{{ $labels.namespace }}' % [cluster_name],
196205
'home-nfs',
197206
0,
198207
'take immediate action',
@@ -204,12 +213,24 @@ function(VARS_2I2C_AWS_ACCOUNT_ID=null)
204213
10,
205214
'same day action needed'
206215
),
216+
makePVCApproachingFullAlert(
217+
'Hub Database Disk is full: cluster:%s hub:{{ $labels.namespace }}' % [cluster_name],
218+
'hub-db-dir',
219+
0,
220+
'take immediate action'
221+
),
207222
makePVCApproachingFullAlert(
208223
'Prometheus Disk about to be full: cluster:%s' % [cluster_name],
209224
'support-prometheus-server',
210225
10,
211226
'same day action needed'
212227
),
228+
makePVCApproachingFullAlert(
229+
'Prometheus Disk is full: cluster:%s' % [cluster_name],
230+
'support-prometheus-server',
231+
0,
232+
'take immediate action'
233+
),
213234
],
214235
},
215236
{

0 commit comments

Comments
 (0)