Skip to content

Commit

Permalink
Fix maintenance rule not being processed
Browse files Browse the repository at this point in the history
  • Loading branch information
Gabriel Saratura committed Sep 26, 2023
1 parent 55e4108 commit 4d020a1
Show file tree
Hide file tree
Showing 17 changed files with 122 additions and 1 deletion.
3 changes: 2 additions & 1 deletion component/main.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,8 @@ local emailSecret = kube.Secret(params.services.vshn.emailAlerting.secretName) {
[if isOpenshift then '10_clusterrole_finalizer']: finalizerRole,
'10_clusterrole_services_read': readServices,
'10_appcat_namespace': ns,
'10_appcat_recording_rule': promRule,
'10_appcat_billing_recording_rule': promRule,
'10_appcat_maintenance_recording_rule': maintenanceRule,
[if params.services.vshn.enabled && params.services.vshn.emailAlerting.enabled then '10_mailgun_secret']: emailSecret,

} + if params.slos.enabled then {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
annotations: {}
labels:
name: appcat-maintenance
name: appcat-maintenance
namespace: syn-appcat
spec:
groups:
- name: appcat-cluster-maintenance
rules:
- expr: scalar(max(max_over_time(openshift_upgrade_controller_upgradejob_state{state="active"}[10m]))
or vector(0))
record: appcat:cluster:maintenance
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
annotations: {}
labels:
name: appcat-maintenance
name: appcat-maintenance
namespace: syn-appcat
spec:
groups:
- name: appcat-cluster-maintenance
rules:
- expr: scalar(max(max_over_time(openshift_upgrade_controller_upgradejob_state{state="active"}[10m]))
or vector(0))
record: appcat:cluster:maintenance
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
annotations: {}
labels:
name: appcat-maintenance
name: appcat-maintenance
namespace: syn-appcat
spec:
groups:
- name: appcat-cluster-maintenance
rules:
- expr: scalar(max(max_over_time(openshift_upgrade_controller_upgradejob_state{state="active"}[10m]))
or vector(0))
record: appcat:cluster:maintenance
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
annotations: {}
labels:
name: appcat-maintenance
name: appcat-maintenance
namespace: syn-appcat
spec:
groups:
- name: appcat-cluster-maintenance
rules:
- expr: scalar(max(max_over_time(openshift_upgrade_controller_upgradejob_state{state="active"}[10m]))
or vector(0))
record: appcat:cluster:maintenance
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
annotations: {}
labels:
name: appcat-maintenance
name: appcat-maintenance
namespace: syn-appcat
spec:
groups:
- name: appcat-cluster-maintenance
rules:
- expr: scalar(max(max_over_time(openshift_upgrade_controller_upgradejob_state{state="active"}[10m]))
or vector(0))
record: appcat:cluster:maintenance
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
annotations: {}
labels:
name: appcat-maintenance
name: appcat-maintenance
namespace: syn-appcat
spec:
groups:
- name: appcat-cluster-maintenance
rules:
- expr: scalar(max(max_over_time(openshift_upgrade_controller_upgradejob_state{state="active"}[10m]))
or vector(0))
record: appcat:cluster:maintenance
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
annotations: {}
labels:
name: appcat-maintenance
name: appcat-maintenance
namespace: syn-appcat
spec:
groups:
- name: appcat-cluster-maintenance
rules:
- expr: scalar(max(max_over_time(openshift_upgrade_controller_upgradejob_state{state="active"}[10m]))
or vector(0))
record: appcat:cluster:maintenance
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
annotations: {}
labels:
name: appcat-maintenance
name: appcat-maintenance
namespace: syn-appcat
spec:
groups:
- name: appcat-cluster-maintenance
rules:
- expr: scalar(max(max_over_time(openshift_upgrade_controller_upgradejob_state{state="active"}[10m]))
or vector(0))
record: appcat:cluster:maintenance

0 comments on commit 4d020a1

Please sign in to comment.