From 6fa75ac826231a8d65408f276fa68ecd16a1702c Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Sat, 23 Mar 2024 08:28:01 -0400 Subject: [PATCH] feat: move alerts into namespace.yaml Signed-off-by: Devin Buhl --- .../actions-runner-system/kustomization.yaml | 1 - .../apps/actions-runner-system/namespace.yaml | 30 +++++++++++++++ .../actions-runner-system/notifications.yaml | 30 --------------- .../main/apps/cert-manager/kustomization.yaml | 1 - .../main/apps/cert-manager/namespace.yaml | 30 +++++++++++++++ .../main/apps/cert-manager/notifications.yaml | 30 --------------- .../main/apps/database/kustomization.yaml | 1 - kubernetes/main/apps/database/namespace.yaml | 30 +++++++++++++++ .../main/apps/database/notifications.yaml | 30 --------------- .../main/apps/default/kustomization.yaml | 1 - kubernetes/main/apps/default/namespace.yaml | 30 +++++++++++++++ .../main/apps/default/notifications.yaml | 30 --------------- .../apps/external-secrets/kustomization.yaml | 1 - .../main/apps/external-secrets/namespace.yaml | 30 +++++++++++++++ .../apps/external-secrets/notifications.yaml | 30 --------------- .../main/apps/flux-system/kustomization.yaml | 1 - .../main/apps/flux-system/namespace.yaml | 38 +++++++++++++++++++ .../main/apps/flux-system/notifications.yaml | 38 ------------------- .../main/apps/kube-system/kustomization.yaml | 1 - .../main/apps/kube-system/namespace.yaml | 30 +++++++++++++++ .../main/apps/kube-system/notifications.yaml | 30 --------------- .../main/apps/network/kustomization.yaml | 1 - kubernetes/main/apps/network/namespace.yaml | 30 +++++++++++++++ .../main/apps/network/notifications.yaml | 30 --------------- .../apps/observability/kustomization.yaml | 1 - .../main/apps/observability/namespace.yaml | 30 +++++++++++++++ .../apps/observability/notifications.yaml | 30 --------------- .../apps/openebs-system/kustomization.yaml | 1 - .../main/apps/openebs-system/namespace.yaml | 30 +++++++++++++++ .../apps/openebs-system/notifications.yaml | 30 --------------- .../main/apps/rook-ceph/kustomization.yaml | 1 - kubernetes/main/apps/rook-ceph/namespace.yaml | 30 +++++++++++++++ .../main/apps/rook-ceph/notifications.yaml | 30 --------------- .../apps/system-upgrade/kustomization.yaml | 1 - .../main/apps/system-upgrade/namespace.yaml | 30 +++++++++++++++ .../apps/system-upgrade/notifications.yaml | 30 --------------- .../apps/volsync-system/kustomization.yaml | 1 - .../main/apps/volsync-system/namespace.yaml | 30 +++++++++++++++ .../apps/volsync-system/notifications.yaml | 30 --------------- 39 files changed, 398 insertions(+), 411 deletions(-) delete mode 100644 kubernetes/main/apps/actions-runner-system/notifications.yaml delete mode 100644 kubernetes/main/apps/cert-manager/notifications.yaml delete mode 100644 kubernetes/main/apps/database/notifications.yaml delete mode 100644 kubernetes/main/apps/default/notifications.yaml delete mode 100644 kubernetes/main/apps/external-secrets/notifications.yaml delete mode 100644 kubernetes/main/apps/flux-system/notifications.yaml delete mode 100644 kubernetes/main/apps/kube-system/notifications.yaml delete mode 100644 kubernetes/main/apps/network/notifications.yaml delete mode 100644 kubernetes/main/apps/observability/notifications.yaml delete mode 100644 kubernetes/main/apps/openebs-system/notifications.yaml delete mode 100644 kubernetes/main/apps/rook-ceph/notifications.yaml delete mode 100644 kubernetes/main/apps/system-upgrade/notifications.yaml delete mode 100644 kubernetes/main/apps/volsync-system/notifications.yaml diff --git a/kubernetes/main/apps/actions-runner-system/kustomization.yaml b/kubernetes/main/apps/actions-runner-system/kustomization.yaml index 668ab83c54ce3..a46ba6b5a6e40 100644 --- a/kubernetes/main/apps/actions-runner-system/kustomization.yaml +++ b/kubernetes/main/apps/actions-runner-system/kustomization.yaml @@ -5,6 +5,5 @@ kind: Kustomization resources: # Pre Flux-Kustomizations - ./namespace.yaml - - ./notifications.yaml # Flux-Kustomizations - ./actions-runner-controller/ks.yaml diff --git a/kubernetes/main/apps/actions-runner-system/namespace.yaml b/kubernetes/main/apps/actions-runner-system/namespace.yaml index d6512dfb82e10..7bdef02e23f40 100644 --- a/kubernetes/main/apps/actions-runner-system/namespace.yaml +++ b/kubernetes/main/apps/actions-runner-system/namespace.yaml @@ -6,3 +6,33 @@ metadata: annotations: kustomize.toolkit.fluxcd.io/prune: disabled volsync.backube/privileged-movers: "true" +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Provider +metadata: + name: alert-manager + namespace: actions-runner-system +spec: + type: alertmanager + address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Alert +metadata: + name: alert-manager + namespace: actions-runner-system +spec: + providerRef: + name: alert-manager + eventSeverity: error + eventSources: + - kind: HelmRelease + name: "*" + exclusionList: + - "error.*lookup github\\.com" + - "error.*lookup raw\\.githubusercontent\\.com" + - "dial.*tcp.*timeout" + - "waiting.*socket" + suspend: false diff --git a/kubernetes/main/apps/actions-runner-system/notifications.yaml b/kubernetes/main/apps/actions-runner-system/notifications.yaml deleted file mode 100644 index 7ca659d93eb7b..0000000000000 --- a/kubernetes/main/apps/actions-runner-system/notifications.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Provider -metadata: - name: alert-manager - namespace: actions-runner-system -spec: - type: alertmanager - address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Alert -metadata: - name: alert-manager - namespace: actions-runner-system -spec: - providerRef: - name: alert-manager - eventSeverity: error - eventSources: - - kind: HelmRelease - name: "*" - exclusionList: - - "error.*lookup github\\.com" - - "error.*lookup raw\\.githubusercontent\\.com" - - "dial.*tcp.*timeout" - - "waiting.*socket" - suspend: false diff --git a/kubernetes/main/apps/cert-manager/kustomization.yaml b/kubernetes/main/apps/cert-manager/kustomization.yaml index 9a80a1aa5f2cd..f173691254275 100644 --- a/kubernetes/main/apps/cert-manager/kustomization.yaml +++ b/kubernetes/main/apps/cert-manager/kustomization.yaml @@ -5,6 +5,5 @@ kind: Kustomization resources: # Pre Flux-Kustomizations - ./namespace.yaml - - ./notifications.yaml # Flux-Kustomizations - ./cert-manager/ks.yaml diff --git a/kubernetes/main/apps/cert-manager/namespace.yaml b/kubernetes/main/apps/cert-manager/namespace.yaml index badc4ccdbd9db..9e6a66025f6ec 100644 --- a/kubernetes/main/apps/cert-manager/namespace.yaml +++ b/kubernetes/main/apps/cert-manager/namespace.yaml @@ -6,3 +6,33 @@ metadata: annotations: kustomize.toolkit.fluxcd.io/prune: disabled volsync.backube/privileged-movers: "true" +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Provider +metadata: + name: alert-manager + namespace: cert-manager +spec: + type: alertmanager + address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Alert +metadata: + name: alert-manager + namespace: cert-manager +spec: + providerRef: + name: alert-manager + eventSeverity: error + eventSources: + - kind: HelmRelease + name: "*" + exclusionList: + - "error.*lookup github\\.com" + - "error.*lookup raw\\.githubusercontent\\.com" + - "dial.*tcp.*timeout" + - "waiting.*socket" + suspend: false diff --git a/kubernetes/main/apps/cert-manager/notifications.yaml b/kubernetes/main/apps/cert-manager/notifications.yaml deleted file mode 100644 index 4837f5febf4a9..0000000000000 --- a/kubernetes/main/apps/cert-manager/notifications.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Provider -metadata: - name: alert-manager - namespace: cert-manager -spec: - type: alertmanager - address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Alert -metadata: - name: alert-manager - namespace: cert-manager -spec: - providerRef: - name: alert-manager - eventSeverity: error - eventSources: - - kind: HelmRelease - name: "*" - exclusionList: - - "error.*lookup github\\.com" - - "error.*lookup raw\\.githubusercontent\\.com" - - "dial.*tcp.*timeout" - - "waiting.*socket" - suspend: false diff --git a/kubernetes/main/apps/database/kustomization.yaml b/kubernetes/main/apps/database/kustomization.yaml index 7931821aea4e8..fd1bf34757af1 100644 --- a/kubernetes/main/apps/database/kustomization.yaml +++ b/kubernetes/main/apps/database/kustomization.yaml @@ -5,7 +5,6 @@ kind: Kustomization resources: # Pre Flux-Kustomizations - ./namespace.yaml - - ./notifications.yaml # Flux-Kustomizations - ./cloudnative-pg/ks.yaml - ./redis/ks.yaml diff --git a/kubernetes/main/apps/database/namespace.yaml b/kubernetes/main/apps/database/namespace.yaml index a4ff321e0db38..70a0cf10182db 100644 --- a/kubernetes/main/apps/database/namespace.yaml +++ b/kubernetes/main/apps/database/namespace.yaml @@ -6,3 +6,33 @@ metadata: annotations: kustomize.toolkit.fluxcd.io/prune: disabled volsync.backube/privileged-movers: "true" +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Provider +metadata: + name: alert-manager + namespace: database +spec: + type: alertmanager + address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Alert +metadata: + name: alert-manager + namespace: database +spec: + providerRef: + name: alert-manager + eventSeverity: error + eventSources: + - kind: HelmRelease + name: "*" + exclusionList: + - "error.*lookup github\\.com" + - "error.*lookup raw\\.githubusercontent\\.com" + - "dial.*tcp.*timeout" + - "waiting.*socket" + suspend: false diff --git a/kubernetes/main/apps/database/notifications.yaml b/kubernetes/main/apps/database/notifications.yaml deleted file mode 100644 index 3dcc7bd5bbe09..0000000000000 --- a/kubernetes/main/apps/database/notifications.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Provider -metadata: - name: alert-manager - namespace: database -spec: - type: alertmanager - address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Alert -metadata: - name: alert-manager - namespace: database -spec: - providerRef: - name: alert-manager - eventSeverity: error - eventSources: - - kind: HelmRelease - name: "*" - exclusionList: - - "error.*lookup github\\.com" - - "error.*lookup raw\\.githubusercontent\\.com" - - "dial.*tcp.*timeout" - - "waiting.*socket" - suspend: false diff --git a/kubernetes/main/apps/default/kustomization.yaml b/kubernetes/main/apps/default/kustomization.yaml index 92b5f8a46c29b..795ce8830414f 100644 --- a/kubernetes/main/apps/default/kustomization.yaml +++ b/kubernetes/main/apps/default/kustomization.yaml @@ -5,7 +5,6 @@ kind: Kustomization resources: # Pre Flux-Kustomizations - ./namespace.yaml - - ./notifications.yaml # Flux-Kustomizations - ./atuin/ks.yaml - ./authelia/ks.yaml diff --git a/kubernetes/main/apps/default/namespace.yaml b/kubernetes/main/apps/default/namespace.yaml index 427b91994788d..043eee7d7c8d7 100644 --- a/kubernetes/main/apps/default/namespace.yaml +++ b/kubernetes/main/apps/default/namespace.yaml @@ -6,3 +6,33 @@ metadata: annotations: kustomize.toolkit.fluxcd.io/prune: disabled volsync.backube/privileged-movers: "true" +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Provider +metadata: + name: alert-manager + namespace: default +spec: + type: alertmanager + address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Alert +metadata: + name: alert-manager + namespace: default +spec: + providerRef: + name: alert-manager + eventSeverity: error + eventSources: + - kind: HelmRelease + name: "*" + exclusionList: + - "error.*lookup github\\.com" + - "error.*lookup raw\\.githubusercontent\\.com" + - "dial.*tcp.*timeout" + - "waiting.*socket" + suspend: false diff --git a/kubernetes/main/apps/default/notifications.yaml b/kubernetes/main/apps/default/notifications.yaml deleted file mode 100644 index 1290dbbee3de4..0000000000000 --- a/kubernetes/main/apps/default/notifications.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Provider -metadata: - name: alert-manager - namespace: default -spec: - type: alertmanager - address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Alert -metadata: - name: alert-manager - namespace: default -spec: - providerRef: - name: alert-manager - eventSeverity: error - eventSources: - - kind: HelmRelease - name: "*" - exclusionList: - - "error.*lookup github\\.com" - - "error.*lookup raw\\.githubusercontent\\.com" - - "dial.*tcp.*timeout" - - "waiting.*socket" - suspend: false diff --git a/kubernetes/main/apps/external-secrets/kustomization.yaml b/kubernetes/main/apps/external-secrets/kustomization.yaml index 51057bc33c008..8b5a7e3460183 100644 --- a/kubernetes/main/apps/external-secrets/kustomization.yaml +++ b/kubernetes/main/apps/external-secrets/kustomization.yaml @@ -5,6 +5,5 @@ kind: Kustomization resources: # Pre Flux-Kustomizations - ./namespace.yaml - - ./notifications.yaml # Flux-Kustomizations - ./external-secrets/ks.yaml diff --git a/kubernetes/main/apps/external-secrets/namespace.yaml b/kubernetes/main/apps/external-secrets/namespace.yaml index 26718c2a68cf1..2a768989682ec 100644 --- a/kubernetes/main/apps/external-secrets/namespace.yaml +++ b/kubernetes/main/apps/external-secrets/namespace.yaml @@ -5,3 +5,33 @@ metadata: name: external-secrets labels: kustomize.toolkit.fluxcd.io/prune: disabled +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Provider +metadata: + name: alert-manager + namespace: external-secrets +spec: + type: alertmanager + address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Alert +metadata: + name: alert-manager + namespace: external-secrets +spec: + providerRef: + name: alert-manager + eventSeverity: error + eventSources: + - kind: HelmRelease + name: "*" + exclusionList: + - "error.*lookup github\\.com" + - "error.*lookup raw\\.githubusercontent\\.com" + - "dial.*tcp.*timeout" + - "waiting.*socket" + suspend: false diff --git a/kubernetes/main/apps/external-secrets/notifications.yaml b/kubernetes/main/apps/external-secrets/notifications.yaml deleted file mode 100644 index 80ff13c486b34..0000000000000 --- a/kubernetes/main/apps/external-secrets/notifications.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Provider -metadata: - name: alert-manager - namespace: external-secrets -spec: - type: alertmanager - address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Alert -metadata: - name: alert-manager - namespace: external-secrets -spec: - providerRef: - name: alert-manager - eventSeverity: error - eventSources: - - kind: HelmRelease - name: "*" - exclusionList: - - "error.*lookup github\\.com" - - "error.*lookup raw\\.githubusercontent\\.com" - - "dial.*tcp.*timeout" - - "waiting.*socket" - suspend: false diff --git a/kubernetes/main/apps/flux-system/kustomization.yaml b/kubernetes/main/apps/flux-system/kustomization.yaml index d3ed723081a26..95df4db767282 100644 --- a/kubernetes/main/apps/flux-system/kustomization.yaml +++ b/kubernetes/main/apps/flux-system/kustomization.yaml @@ -5,6 +5,5 @@ kind: Kustomization resources: # Pre Flux-Kustomizations - ./namespace.yaml - - ./notifications.yaml # Flux-Kustomizations - ./addons/ks.yaml diff --git a/kubernetes/main/apps/flux-system/namespace.yaml b/kubernetes/main/apps/flux-system/namespace.yaml index a492f92112e8c..38c6a2adf4520 100644 --- a/kubernetes/main/apps/flux-system/namespace.yaml +++ b/kubernetes/main/apps/flux-system/namespace.yaml @@ -6,3 +6,41 @@ metadata: annotations: kustomize.toolkit.fluxcd.io/prune: disabled volsync.backube/privileged-movers: "true" +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Provider +metadata: + name: alert-manager + namespace: flux-system +spec: + type: alertmanager + address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Alert +metadata: + name: alert-manager + namespace: flux-system +spec: + providerRef: + name: alert-manager + eventSeverity: error + eventSources: + - kind: GitRepository + name: "*" + - kind: HelmRelease + name: "*" + - kind: HelmRepository + name: "*" + - kind: Kustomization + name: "*" + - kind: OCIRepository + name: "*" + exclusionList: + - "error.*lookup github\\.com" + - "error.*lookup raw\\.githubusercontent\\.com" + - "dial.*tcp.*timeout" + - "waiting.*socket" + suspend: false diff --git a/kubernetes/main/apps/flux-system/notifications.yaml b/kubernetes/main/apps/flux-system/notifications.yaml deleted file mode 100644 index 0168beb60cfae..0000000000000 --- a/kubernetes/main/apps/flux-system/notifications.yaml +++ /dev/null @@ -1,38 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Provider -metadata: - name: alert-manager - namespace: flux-system -spec: - type: alertmanager - address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Alert -metadata: - name: alert-manager - namespace: flux-system -spec: - providerRef: - name: alert-manager - eventSeverity: error - eventSources: - - kind: GitRepository - name: "*" - - kind: HelmRelease - name: "*" - - kind: HelmRepository - name: "*" - - kind: Kustomization - name: "*" - - kind: OCIRepository - name: "*" - exclusionList: - - "error.*lookup github\\.com" - - "error.*lookup raw\\.githubusercontent\\.com" - - "dial.*tcp.*timeout" - - "waiting.*socket" - suspend: false diff --git a/kubernetes/main/apps/kube-system/kustomization.yaml b/kubernetes/main/apps/kube-system/kustomization.yaml index 0f3fe70e85e53..c4026e63244e2 100644 --- a/kubernetes/main/apps/kube-system/kustomization.yaml +++ b/kubernetes/main/apps/kube-system/kustomization.yaml @@ -5,7 +5,6 @@ kind: Kustomization resources: # Pre Flux-Kustomizations - ./namespace.yaml - - ./notifications.yaml # Flux-Kustomizations - ./coredns/ks.yaml - ./cilium/ks.yaml diff --git a/kubernetes/main/apps/kube-system/namespace.yaml b/kubernetes/main/apps/kube-system/namespace.yaml index a437cb0f8147e..c16492e39464c 100644 --- a/kubernetes/main/apps/kube-system/namespace.yaml +++ b/kubernetes/main/apps/kube-system/namespace.yaml @@ -6,3 +6,33 @@ metadata: annotations: kustomize.toolkit.fluxcd.io/prune: disabled volsync.backube/privileged-movers: "true" +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Provider +metadata: + name: alert-manager + namespace: kube-system +spec: + type: alertmanager + address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Alert +metadata: + name: alert-manager + namespace: kube-system +spec: + providerRef: + name: alert-manager + eventSeverity: error + eventSources: + - kind: HelmRelease + name: "*" + exclusionList: + - "error.*lookup github\\.com" + - "error.*lookup raw\\.githubusercontent\\.com" + - "dial.*tcp.*timeout" + - "waiting.*socket" + suspend: false diff --git a/kubernetes/main/apps/kube-system/notifications.yaml b/kubernetes/main/apps/kube-system/notifications.yaml deleted file mode 100644 index a0680a057757b..0000000000000 --- a/kubernetes/main/apps/kube-system/notifications.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Provider -metadata: - name: alert-manager - namespace: kube-system -spec: - type: alertmanager - address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Alert -metadata: - name: alert-manager - namespace: kube-system -spec: - providerRef: - name: alert-manager - eventSeverity: error - eventSources: - - kind: HelmRelease - name: "*" - exclusionList: - - "error.*lookup github\\.com" - - "error.*lookup raw\\.githubusercontent\\.com" - - "dial.*tcp.*timeout" - - "waiting.*socket" - suspend: false diff --git a/kubernetes/main/apps/network/kustomization.yaml b/kubernetes/main/apps/network/kustomization.yaml index 49ec9999730ed..eb1f5bbaab542 100644 --- a/kubernetes/main/apps/network/kustomization.yaml +++ b/kubernetes/main/apps/network/kustomization.yaml @@ -5,7 +5,6 @@ kind: Kustomization resources: # Pre Flux-Kustomizations - ./namespace.yaml - - ./notifications.yaml # Flux-Kustomizations - ./cloudflared/ks.yaml - ./echo-server/ks.yaml diff --git a/kubernetes/main/apps/network/namespace.yaml b/kubernetes/main/apps/network/namespace.yaml index 73258558620d3..356e3dc5a13ea 100644 --- a/kubernetes/main/apps/network/namespace.yaml +++ b/kubernetes/main/apps/network/namespace.yaml @@ -6,3 +6,33 @@ metadata: annotations: kustomize.toolkit.fluxcd.io/prune: disabled volsync.backube/privileged-movers: "true" +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Provider +metadata: + name: alert-manager + namespace: network +spec: + type: alertmanager + address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Alert +metadata: + name: alert-manager + namespace: network +spec: + providerRef: + name: alert-manager + eventSeverity: error + eventSources: + - kind: HelmRelease + name: "*" + exclusionList: + - "error.*lookup github\\.com" + - "error.*lookup raw\\.githubusercontent\\.com" + - "dial.*tcp.*timeout" + - "waiting.*socket" + suspend: false diff --git a/kubernetes/main/apps/network/notifications.yaml b/kubernetes/main/apps/network/notifications.yaml deleted file mode 100644 index 8c4229683caec..0000000000000 --- a/kubernetes/main/apps/network/notifications.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Provider -metadata: - name: alert-manager - namespace: network -spec: - type: alertmanager - address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Alert -metadata: - name: alert-manager - namespace: network -spec: - providerRef: - name: alert-manager - eventSeverity: error - eventSources: - - kind: HelmRelease - name: "*" - exclusionList: - - "error.*lookup github\\.com" - - "error.*lookup raw\\.githubusercontent\\.com" - - "dial.*tcp.*timeout" - - "waiting.*socket" - suspend: false diff --git a/kubernetes/main/apps/observability/kustomization.yaml b/kubernetes/main/apps/observability/kustomization.yaml index 5b08faa51d39b..82c4df29cdace 100644 --- a/kubernetes/main/apps/observability/kustomization.yaml +++ b/kubernetes/main/apps/observability/kustomization.yaml @@ -5,7 +5,6 @@ kind: Kustomization resources: # Pre Flux-Kustomizations - ./namespace.yaml - - ./notifications.yaml # Flux-Kustomizations - ./alertmanager-silencer/ks.yaml - ./gatus/ks.yaml diff --git a/kubernetes/main/apps/observability/namespace.yaml b/kubernetes/main/apps/observability/namespace.yaml index ce3a5bd22a057..cef355262d2fe 100644 --- a/kubernetes/main/apps/observability/namespace.yaml +++ b/kubernetes/main/apps/observability/namespace.yaml @@ -5,3 +5,33 @@ metadata: name: observability labels: kustomize.toolkit.fluxcd.io/prune: disabled +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Provider +metadata: + name: alert-manager + namespace: observability +spec: + type: alertmanager + address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Alert +metadata: + name: alert-manager + namespace: observability +spec: + providerRef: + name: alert-manager + eventSeverity: error + eventSources: + - kind: HelmRelease + name: "*" + exclusionList: + - "error.*lookup github\\.com" + - "error.*lookup raw\\.githubusercontent\\.com" + - "dial.*tcp.*timeout" + - "waiting.*socket" + suspend: false diff --git a/kubernetes/main/apps/observability/notifications.yaml b/kubernetes/main/apps/observability/notifications.yaml deleted file mode 100644 index 6bac10b29c1f6..0000000000000 --- a/kubernetes/main/apps/observability/notifications.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Provider -metadata: - name: alert-manager - namespace: observability -spec: - type: alertmanager - address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Alert -metadata: - name: alert-manager - namespace: observability -spec: - providerRef: - name: alert-manager - eventSeverity: error - eventSources: - - kind: HelmRelease - name: "*" - exclusionList: - - "error.*lookup github\\.com" - - "error.*lookup raw\\.githubusercontent\\.com" - - "dial.*tcp.*timeout" - - "waiting.*socket" - suspend: false diff --git a/kubernetes/main/apps/openebs-system/kustomization.yaml b/kubernetes/main/apps/openebs-system/kustomization.yaml index 4ed6ec1c06620..011b51012e059 100644 --- a/kubernetes/main/apps/openebs-system/kustomization.yaml +++ b/kubernetes/main/apps/openebs-system/kustomization.yaml @@ -5,6 +5,5 @@ kind: Kustomization resources: # Pre Flux-Kustomizations - ./namespace.yaml - - ./notifications.yaml # Flux-Kustomizations - ./openebs/ks.yaml diff --git a/kubernetes/main/apps/openebs-system/namespace.yaml b/kubernetes/main/apps/openebs-system/namespace.yaml index 18921b50d64ea..49bcf897d45b7 100644 --- a/kubernetes/main/apps/openebs-system/namespace.yaml +++ b/kubernetes/main/apps/openebs-system/namespace.yaml @@ -6,3 +6,33 @@ metadata: annotations: kustomize.toolkit.fluxcd.io/prune: disabled volsync.backube/privileged-movers: "true" +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Provider +metadata: + name: alert-manager + namespace: openebs-system +spec: + type: alertmanager + address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Alert +metadata: + name: alert-manager + namespace: openebs-system +spec: + providerRef: + name: alert-manager + eventSeverity: error + eventSources: + - kind: HelmRelease + name: "*" + exclusionList: + - "error.*lookup github\\.com" + - "error.*lookup raw\\.githubusercontent\\.com" + - "dial.*tcp.*timeout" + - "waiting.*socket" + suspend: false diff --git a/kubernetes/main/apps/openebs-system/notifications.yaml b/kubernetes/main/apps/openebs-system/notifications.yaml deleted file mode 100644 index 0e19033322abc..0000000000000 --- a/kubernetes/main/apps/openebs-system/notifications.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Provider -metadata: - name: alert-manager - namespace: openebs-system -spec: - type: alertmanager - address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Alert -metadata: - name: alert-manager - namespace: openebs-system -spec: - providerRef: - name: alert-manager - eventSeverity: error - eventSources: - - kind: HelmRelease - name: "*" - exclusionList: - - "error.*lookup github\\.com" - - "error.*lookup raw\\.githubusercontent\\.com" - - "dial.*tcp.*timeout" - - "waiting.*socket" - suspend: false diff --git a/kubernetes/main/apps/rook-ceph/kustomization.yaml b/kubernetes/main/apps/rook-ceph/kustomization.yaml index 2fa7172aae810..dcaf9188b816e 100644 --- a/kubernetes/main/apps/rook-ceph/kustomization.yaml +++ b/kubernetes/main/apps/rook-ceph/kustomization.yaml @@ -5,6 +5,5 @@ kind: Kustomization resources: # Pre Flux-Kustomizations - ./namespace.yaml - - ./notifications.yaml # Flux-Kustomizations - ./rook-ceph/ks.yaml diff --git a/kubernetes/main/apps/rook-ceph/namespace.yaml b/kubernetes/main/apps/rook-ceph/namespace.yaml index 69fda7af43b1e..6253603cc520b 100644 --- a/kubernetes/main/apps/rook-ceph/namespace.yaml +++ b/kubernetes/main/apps/rook-ceph/namespace.yaml @@ -6,3 +6,33 @@ metadata: annotations: kustomize.toolkit.fluxcd.io/prune: disabled volsync.backube/privileged-movers: "true" +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Provider +metadata: + name: alert-manager + namespace: rook-ceph +spec: + type: alertmanager + address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Alert +metadata: + name: alert-manager + namespace: rook-ceph +spec: + providerRef: + name: alert-manager + eventSeverity: error + eventSources: + - kind: HelmRelease + name: "*" + exclusionList: + - "error.*lookup github\\.com" + - "error.*lookup raw\\.githubusercontent\\.com" + - "dial.*tcp.*timeout" + - "waiting.*socket" + suspend: false diff --git a/kubernetes/main/apps/rook-ceph/notifications.yaml b/kubernetes/main/apps/rook-ceph/notifications.yaml deleted file mode 100644 index 158f4248299ff..0000000000000 --- a/kubernetes/main/apps/rook-ceph/notifications.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Provider -metadata: - name: alert-manager - namespace: rook-ceph -spec: - type: alertmanager - address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Alert -metadata: - name: alert-manager - namespace: rook-ceph -spec: - providerRef: - name: alert-manager - eventSeverity: error - eventSources: - - kind: HelmRelease - name: "*" - exclusionList: - - "error.*lookup github\\.com" - - "error.*lookup raw\\.githubusercontent\\.com" - - "dial.*tcp.*timeout" - - "waiting.*socket" - suspend: false diff --git a/kubernetes/main/apps/system-upgrade/kustomization.yaml b/kubernetes/main/apps/system-upgrade/kustomization.yaml index 005f94342008c..affe046605ce4 100644 --- a/kubernetes/main/apps/system-upgrade/kustomization.yaml +++ b/kubernetes/main/apps/system-upgrade/kustomization.yaml @@ -5,6 +5,5 @@ kind: Kustomization resources: # Pre Flux-Kustomizations - ./namespace.yaml - - ./notifications.yaml # Flux-Kustomizations - ./system-upgrade-controller/ks.yaml diff --git a/kubernetes/main/apps/system-upgrade/namespace.yaml b/kubernetes/main/apps/system-upgrade/namespace.yaml index 7889698df10c9..cb902258ab332 100644 --- a/kubernetes/main/apps/system-upgrade/namespace.yaml +++ b/kubernetes/main/apps/system-upgrade/namespace.yaml @@ -6,3 +6,33 @@ metadata: annotations: kustomize.toolkit.fluxcd.io/prune: disabled volsync.backube/privileged-movers: "true" +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Provider +metadata: + name: alert-manager + namespace: system-upgrade +spec: + type: alertmanager + address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Alert +metadata: + name: alert-manager + namespace: system-upgrade +spec: + providerRef: + name: alert-manager + eventSeverity: error + eventSources: + - kind: HelmRelease + name: "*" + exclusionList: + - "error.*lookup github\\.com" + - "error.*lookup raw\\.githubusercontent\\.com" + - "dial.*tcp.*timeout" + - "waiting.*socket" + suspend: false diff --git a/kubernetes/main/apps/system-upgrade/notifications.yaml b/kubernetes/main/apps/system-upgrade/notifications.yaml deleted file mode 100644 index 8413d6ffc3e2b..0000000000000 --- a/kubernetes/main/apps/system-upgrade/notifications.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Provider -metadata: - name: alert-manager - namespace: system-upgrade -spec: - type: alertmanager - address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Alert -metadata: - name: alert-manager - namespace: system-upgrade -spec: - providerRef: - name: alert-manager - eventSeverity: error - eventSources: - - kind: HelmRelease - name: "*" - exclusionList: - - "error.*lookup github\\.com" - - "error.*lookup raw\\.githubusercontent\\.com" - - "dial.*tcp.*timeout" - - "waiting.*socket" - suspend: false diff --git a/kubernetes/main/apps/volsync-system/kustomization.yaml b/kubernetes/main/apps/volsync-system/kustomization.yaml index e00d8fd6eaed1..5b5a44ea55025 100644 --- a/kubernetes/main/apps/volsync-system/kustomization.yaml +++ b/kubernetes/main/apps/volsync-system/kustomization.yaml @@ -5,7 +5,6 @@ kind: Kustomization resources: # Pre Flux-Kustomizations - ./namespace.yaml - - ./notifications.yaml # Flux-Kustomizations - ./snapshot-controller/ks.yaml - ./volsync/ks.yaml diff --git a/kubernetes/main/apps/volsync-system/namespace.yaml b/kubernetes/main/apps/volsync-system/namespace.yaml index af3ef132aa4ae..082ad6dac3ea6 100644 --- a/kubernetes/main/apps/volsync-system/namespace.yaml +++ b/kubernetes/main/apps/volsync-system/namespace.yaml @@ -6,3 +6,33 @@ metadata: annotations: kustomize.toolkit.fluxcd.io/prune: disabled volsync.backube/privileged-movers: "true" +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Provider +metadata: + name: alert-manager + namespace: volsync-system +spec: + type: alertmanager + address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json +apiVersion: notification.toolkit.fluxcd.io/v1beta3 +kind: Alert +metadata: + name: alert-manager + namespace: volsync-system +spec: + providerRef: + name: alert-manager + eventSeverity: error + eventSources: + - kind: HelmRelease + name: "*" + exclusionList: + - "error.*lookup github\\.com" + - "error.*lookup raw\\.githubusercontent\\.com" + - "dial.*tcp.*timeout" + - "waiting.*socket" + suspend: false diff --git a/kubernetes/main/apps/volsync-system/notifications.yaml b/kubernetes/main/apps/volsync-system/notifications.yaml deleted file mode 100644 index e395643498bf3..0000000000000 --- a/kubernetes/main/apps/volsync-system/notifications.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/provider_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Provider -metadata: - name: alert-manager - namespace: volsync-system -spec: - type: alertmanager - address: http://alertmanager-operated.observability.svc.cluster.local:9093/api/v2/alerts/ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/notification.toolkit.fluxcd.io/alert_v1beta3.json -apiVersion: notification.toolkit.fluxcd.io/v1beta3 -kind: Alert -metadata: - name: alert-manager - namespace: volsync-system -spec: - providerRef: - name: alert-manager - eventSeverity: error - eventSources: - - kind: HelmRelease - name: "*" - exclusionList: - - "error.*lookup github\\.com" - - "error.*lookup raw\\.githubusercontent\\.com" - - "dial.*tcp.*timeout" - - "waiting.*socket" - suspend: false