Skip to content

Fix CNPG cluster spread alert #1133

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

Open
TheBigLee wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix CNPG cluster spread alert #1133

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 component/cnpg.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ local prometheusrule = std.prune(kube._Object('monitoring.coreos.com/v1', 'Prome
},
{
alert: 'CNPGClusterZoneSpreadWarning',
expr: 'count by(namespace)(kube_pod_info{namespace=~"vshn-postgresql-.*", pod=~"postgresql-.*"}) > on(namespace) count by(namespace)(count by(namespace, label_topology_kubernetes_io_zone)(kube_pod_info{namespace=~"vshn-postgresql-.*", pod=~"postgresql-.*"} * on(node) group_left(label_topology_kubernetes_io_zone) kube_node_labels)) unless on(namespace) ALERTS{alertname="CNPGClusterInstancesOnSameNode", alertstate="firing"}',
expr: 'count by(namespace)(kube_pod_info{namespace=~"vshn-postgresql-.*", pod=~"postgresql-.*"} * on(pod,namespace) group_right(node) kube_pod_labels{label_cnpg_io_cluster=~".+"}) > on(namespace) count by(namespace)(count by(namespace, label_topology_kubernetes_io_zone)(kube_pod_info{namespace=~"vshn-postgresql-.*", pod=~"postgresql-.*"} * on(node) group_left(label_topology_kubernetes_io_zone) kube_node_labels)) unless on(namespace) ALERTS{alertname="CNPGClusterInstancesOnSameNode", alertstate="firing"}',
'for': '5m',
labels: {
severity: 'warning',
Expand Down
16 changes: 8 additions & 8 deletions tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-0-v4-182-0
name: function-appcat-v3-68-1-v4-182-0
spec:
package: ghcr.io/vshn/appcat:v4.182.0-func
packagePullPolicy: IfNotPresent
Expand All @@ -32,9 +32,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-1-v4-182-0
name: function-appcat-v3-68-2-v4-182-1
spec:
package: ghcr.io/vshn/appcat:v4.182.0-func
package: ghcr.io/vshn/appcat:v4.182.1-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand All @@ -46,7 +46,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-2-v4-182-1
name: function-appcat-v3-68-3-v4-182-1
spec:
package: ghcr.io/vshn/appcat:v4.182.1-func
packagePullPolicy: IfNotPresent
Expand All @@ -60,9 +60,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-3-v4-182-1
name: function-appcat-v3-69-0-v4-183-0
spec:
package: ghcr.io/vshn/appcat:v4.182.1-func
package: ghcr.io/vshn/appcat:v4.183.0-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand All @@ -74,9 +74,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-69-0-v4-183-0
name: function-appcat-v3-70-0-v4-184-0
spec:
package: ghcr.io/vshn/appcat:v4.183.0-func
package: ghcr.io/vshn/appcat:v4.184.0-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand Down
16 changes: 8 additions & 8 deletions tests/golden/defaults/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-0-v4-182-0
name: function-appcat-v3-68-1-v4-182-0
spec:
package: ghcr.io/vshn/appcat:v4.182.0-func
packagePullPolicy: IfNotPresent
Expand All @@ -32,9 +32,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-1-v4-182-0
name: function-appcat-v3-68-2-v4-182-1
spec:
package: ghcr.io/vshn/appcat:v4.182.0-func
package: ghcr.io/vshn/appcat:v4.182.1-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand All @@ -46,7 +46,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-2-v4-182-1
name: function-appcat-v3-68-3-v4-182-1
spec:
package: ghcr.io/vshn/appcat:v4.182.1-func
packagePullPolicy: IfNotPresent
Expand All @@ -60,9 +60,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-3-v4-182-1
name: function-appcat-v3-69-0-v4-183-0
spec:
package: ghcr.io/vshn/appcat:v4.182.1-func
package: ghcr.io/vshn/appcat:v4.183.0-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand All @@ -74,9 +74,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-69-0-v4-183-0
name: function-appcat-v3-70-0-v4-184-0
spec:
package: ghcr.io/vshn/appcat:v4.183.0-func
package: ghcr.io/vshn/appcat:v4.184.0-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand Down
16 changes: 8 additions & 8 deletions tests/golden/dev-talos/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-0-v4-182-0
name: function-appcat-v3-68-1-v4-182-0
spec:
package: ghcr.io/vshn/appcat:v4.182.0-func
packagePullPolicy: Always
Expand All @@ -32,9 +32,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-1-v4-182-0
name: function-appcat-v3-68-2-v4-182-1
spec:
package: ghcr.io/vshn/appcat:v4.182.0-func
package: ghcr.io/vshn/appcat:v4.182.1-func
packagePullPolicy: Always
runtimeConfigRef:
name: function-appcat
Expand All @@ -46,7 +46,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-2-v4-182-1
name: function-appcat-v3-68-3-v4-182-1
spec:
package: ghcr.io/vshn/appcat:v4.182.1-func
packagePullPolicy: Always
Expand All @@ -60,9 +60,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-3-v4-182-1
name: function-appcat-v3-69-0-v4-183-0
spec:
package: ghcr.io/vshn/appcat:v4.182.1-func
package: ghcr.io/vshn/appcat:v4.183.0-func
packagePullPolicy: Always
runtimeConfigRef:
name: function-appcat
Expand All @@ -74,9 +74,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-69-0-v4-183-0
name: function-appcat-v3-70-0-v4-184-0
spec:
package: ghcr.io/vshn/appcat:v4.183.0-func
package: ghcr.io/vshn/appcat:v4.184.0-func
packagePullPolicy: Always
runtimeConfigRef:
name: function-appcat
Expand Down
16 changes: 8 additions & 8 deletions tests/golden/dev/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-0-v4-182-0
name: function-appcat-v3-68-1-v4-182-0
spec:
package: ghcr.io/vshn/appcat:v4.182.0-func
packagePullPolicy: Always
Expand All @@ -32,9 +32,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-1-v4-182-0
name: function-appcat-v3-68-2-v4-182-1
spec:
package: ghcr.io/vshn/appcat:v4.182.0-func
package: ghcr.io/vshn/appcat:v4.182.1-func
packagePullPolicy: Always
runtimeConfigRef:
name: enable-proxy
Expand All @@ -46,7 +46,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-2-v4-182-1
name: function-appcat-v3-68-3-v4-182-1
spec:
package: ghcr.io/vshn/appcat:v4.182.1-func
packagePullPolicy: Always
Expand All @@ -60,9 +60,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-3-v4-182-1
name: function-appcat-v3-69-0-v4-183-0
spec:
package: ghcr.io/vshn/appcat:v4.182.1-func
package: ghcr.io/vshn/appcat:v4.183.0-func
packagePullPolicy: Always
runtimeConfigRef:
name: enable-proxy
Expand All @@ -74,9 +74,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-69-0-v4-183-0
name: function-appcat-v3-70-0-v4-184-0
spec:
package: ghcr.io/vshn/appcat:v4.183.0-func
package: ghcr.io/vshn/appcat:v4.184.0-func
packagePullPolicy: Always
runtimeConfigRef:
name: enable-proxy
Expand Down
16 changes: 8 additions & 8 deletions tests/golden/exodev/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-0-v4-182-0
name: function-appcat-v3-68-1-v4-182-0
spec:
package: ghcr.io/vshn/appcat:v4.182.0-func
packagePullPolicy: IfNotPresent
Expand All @@ -32,9 +32,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-1-v4-182-0
name: function-appcat-v3-68-2-v4-182-1
spec:
package: ghcr.io/vshn/appcat:v4.182.0-func
package: ghcr.io/vshn/appcat:v4.182.1-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand All @@ -46,7 +46,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-2-v4-182-1
name: function-appcat-v3-68-3-v4-182-1
spec:
package: ghcr.io/vshn/appcat:v4.182.1-func
packagePullPolicy: IfNotPresent
Expand All @@ -60,9 +60,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-3-v4-182-1
name: function-appcat-v3-69-0-v4-183-0
spec:
package: ghcr.io/vshn/appcat:v4.182.1-func
package: ghcr.io/vshn/appcat:v4.183.0-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand All @@ -74,9 +74,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-69-0-v4-183-0
name: function-appcat-v3-70-0-v4-184-0
spec:
package: ghcr.io/vshn/appcat:v4.183.0-func
package: ghcr.io/vshn/appcat:v4.184.0-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand Down
16 changes: 8 additions & 8 deletions tests/golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-0-v4-182-0
name: function-appcat-v3-68-1-v4-182-0
spec:
package: ghcr.io/vshn/appcat:v4.182.0-func
packagePullPolicy: IfNotPresent
Expand All @@ -32,9 +32,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-1-v4-182-0
name: function-appcat-v3-68-2-v4-182-1
spec:
package: ghcr.io/vshn/appcat:v4.182.0-func
package: ghcr.io/vshn/appcat:v4.182.1-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand All @@ -46,7 +46,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-2-v4-182-1
name: function-appcat-v3-68-3-v4-182-1
spec:
package: ghcr.io/vshn/appcat:v4.182.1-func
packagePullPolicy: IfNotPresent
Expand All @@ -60,9 +60,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-3-v4-182-1
name: function-appcat-v3-69-0-v4-183-0
spec:
package: ghcr.io/vshn/appcat:v4.182.1-func
package: ghcr.io/vshn/appcat:v4.183.0-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand All @@ -74,9 +74,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-69-0-v4-183-0
name: function-appcat-v3-70-0-v4-184-0
spec:
package: ghcr.io/vshn/appcat:v4.183.0-func
package: ghcr.io/vshn/appcat:v4.184.0-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand Down
16 changes: 8 additions & 8 deletions tests/golden/vshn-managed/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-0-v4-182-0
name: function-appcat-v3-68-1-v4-182-0
spec:
package: ghcr.io/vshn/appcat:v4.182.0-func
packagePullPolicy: IfNotPresent
Expand All @@ -32,9 +32,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-1-v4-182-0
name: function-appcat-v3-68-2-v4-182-1
spec:
package: ghcr.io/vshn/appcat:v4.182.0-func
package: ghcr.io/vshn/appcat:v4.182.1-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand All @@ -46,7 +46,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-2-v4-182-1
name: function-appcat-v3-68-3-v4-182-1
spec:
package: ghcr.io/vshn/appcat:v4.182.1-func
packagePullPolicy: IfNotPresent
Expand All @@ -60,9 +60,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-68-3-v4-182-1
name: function-appcat-v3-69-0-v4-183-0
spec:
package: ghcr.io/vshn/appcat:v4.182.1-func
package: ghcr.io/vshn/appcat:v4.183.0-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand All @@ -74,9 +74,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-v3-69-0-v4-183-0
name: function-appcat-v3-70-0-v4-184-0
spec:
package: ghcr.io/vshn/appcat:v4.183.0-func
package: ghcr.io/vshn/appcat:v4.184.0-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand Down
Loading