diff --git a/deploy/demo/alerts.yml b/deploy/demo/alerts.yml deleted file mode 100644 index 5a0c81f5e..000000000 --- a/deploy/demo/alerts.yml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - namespace: intranet-demo - labels: - role: alert-rules - name: prometheus-custom-rules-intranet-demo -spec: - groups: - - name: application-rules - rules: - - alert: ServiceInsufficientAccessPolicy - expr: http_status_code_wp_home{namespace="intranet-demo"} != 401 - for: 1m - labels: - severity: intranet-demo - annotations: - message: Namespace {{ $labels.namespace }} (homepage) is returning an unexpected status code {{ printf "%0.0f" $value}}. - runbook_url: https://dsdmoj.atlassian.net/wiki/spaces/CDPT/pages/5124292758/Alerts+runbooks#ServiceInsufficientAccessPolicy - dashboard_url: https://grafana.live.cloud-platform.service.justice.gov.uk/d/bdwyqxz07sxkwg/intranet-service?orgId=1&var-namespace=intranet-demo - - - alert: ServiceAbsentAccessPolicy - expr: absent(http_status_code_wp_home{namespace="intranet-demo"}) == 1 - for: 1m - labels: - severity: intranet-demo - annotations: - message: Namespace {{ $labels.namespace }} (homepage) is not returning a status code. - runbook_url: https://dsdmoj.atlassian.net/wiki/spaces/CDPT/pages/5124292758/Alerts+runbooks#ServiceAbsentAccessPolicy - dashboard_url: https://grafana.live.cloud-platform.service.justice.gov.uk/d/bdwyqxz07sxkwg/intranet-service?orgId=1&var-namespace=intranet-demo diff --git a/deploy/demo/network-policy.yml b/deploy/demo/network-policy.yml deleted file mode 100644 index 589fbeb62..000000000 --- a/deploy/demo/network-policy.yml +++ /dev/null @@ -1,16 +0,0 @@ -kind: NetworkPolicy -apiVersion: networking.k8s.io/v1 -metadata: - name: allow-prometheus-scraping - namespace: intranet-demo -spec: - podSelector: - matchLabels: - app: intranet-demo - policyTypes: - - Ingress - ingress: - - from: - - namespaceSelector: - matchLabels: - component: monitoring diff --git a/deploy/demo/pod-monitor.yml b/deploy/demo/pod-monitor.yml deleted file mode 100644 index be45910e2..000000000 --- a/deploy/demo/pod-monitor.yml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PodMonitor -metadata: - name: intranet-demo - namespace: intranet-demo -spec: - selector: - matchLabels: - app: intranet-demo - podMetricsEndpoints: - - port: http - path: "/metrics/fpm" - interval: 15s diff --git a/deploy/demo/service-monitor.yml b/deploy/demo/service-monitor.yml deleted file mode 100644 index 28abfb6d9..000000000 --- a/deploy/demo/service-monitor.yml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: intranet-demo - namespace: intranet-demo -spec: - selector: - matchLabels: - app: intranet-demo - endpoints: - - port: http - interval: 15s - path: /metrics/service diff --git a/deploy/development/alerts.yml b/deploy/development/alerts.yml deleted file mode 100644 index 35ee65bd0..000000000 --- a/deploy/development/alerts.yml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - namespace: intranet-dev - labels: - role: alert-rules - name: prometheus-custom-rules-intranet-dev -spec: - groups: - - name: application-rules - rules: - - alert: ServiceInsufficientAccessPolicy - expr: http_status_code_wp_home{namespace="intranet-dev"} != 401 - for: 1m - labels: - severity: intranet-dev - annotations: - message: Namespace {{ $labels.namespace }} (homepage) is returning an unexpected status code {{ printf "%0.0f" $value}}. - runbook_url: https://dsdmoj.atlassian.net/wiki/spaces/CDPT/pages/5124292758/Alerts+runbooks#ServiceInsufficientAccessPolicy - dashboard_url: https://grafana.live.cloud-platform.service.justice.gov.uk/d/bdwyqxz07sxkwg/intranet-service?orgId=1 - - - alert: ServiceAbsentAccessPolicy - expr: absent(http_status_code_wp_home{namespace="intranet-dev"}) == 1 - for: 1m - labels: - severity: intranet-dev - annotations: - message: Namespace {{ $labels.namespace }} (homepage) is not returning a status code. - runbook_url: https://dsdmoj.atlassian.net/wiki/spaces/CDPT/pages/5124292758/Alerts+runbooks#ServiceAbsentAccessPolicy - dashboard_url: https://grafana.live.cloud-platform.service.justice.gov.uk/d/bdwyqxz07sxkwg/intranet-service?orgId=1 diff --git a/deploy/development/network-policy.yml b/deploy/development/network-policy.yml deleted file mode 100644 index d81d2ce2e..000000000 --- a/deploy/development/network-policy.yml +++ /dev/null @@ -1,16 +0,0 @@ -kind: NetworkPolicy -apiVersion: networking.k8s.io/v1 -metadata: - name: allow-prometheus-scraping - namespace: intranet-dev -spec: - podSelector: - matchLabels: - app: intranet-dev - policyTypes: - - Ingress - ingress: - - from: - - namespaceSelector: - matchLabels: - component: monitoring diff --git a/deploy/development/pod-monitor.yml b/deploy/development/pod-monitor.yml deleted file mode 100644 index 2f8b7c179..000000000 --- a/deploy/development/pod-monitor.yml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PodMonitor -metadata: - name: intranet-dev - namespace: intranet-dev -spec: - selector: - matchLabels: - app: intranet-dev - podMetricsEndpoints: - - port: http - path: "/metrics/fpm" - interval: 15s diff --git a/deploy/development/service-monitor.yml b/deploy/development/service-monitor.yml deleted file mode 100644 index 7e7bac8a0..000000000 --- a/deploy/development/service-monitor.yml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: intranet-dev - namespace: intranet-dev -spec: - selector: - matchLabels: - app: intranet-dev - endpoints: - - port: http - interval: 15s - path: /metrics/service diff --git a/deploy/production/pod-monitor.yml b/deploy/production/pod-monitor.yml deleted file mode 100644 index 4dcbf68ef..000000000 --- a/deploy/production/pod-monitor.yml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PodMonitor -metadata: - name: intranet-production - namespace: intranet-production -spec: - selector: - matchLabels: - app: intranet-production - podMetricsEndpoints: - - port: http - path: "/metrics/fpm" - interval: 15s diff --git a/deploy/staging/alerts.yml b/deploy/staging/alerts.yml deleted file mode 100644 index 2241d2bfd..000000000 --- a/deploy/staging/alerts.yml +++ /dev/null @@ -1,40 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - namespace: intranet-staging - labels: - role: alert-rules - name: prometheus-custom-rules-intranet-staging -spec: - groups: - - name: application-rules - rules: - - alert: ServiceInsufficientAccessPolicy - expr: http_status_code_wp_home{namespace="intranet-staging"} != 401 - for: 1m - labels: - severity: intranet-staging - annotations: - message: Namespace {{ $labels.namespace }} (homepage) is returning an unexpected status code {{ printf "%0.0f" $value}}. - runbook_url: https://dsdmoj.atlassian.net/wiki/spaces/CDPT/pages/5124292758/Alerts+runbooks#ServiceInsufficientAccessPolicy - dashboard_url: https://grafana.live.cloud-platform.service.justice.gov.uk/d/bdwyqxz07sxkwg/intranet-service?orgId=1&var-namespace=intranet-staging - - - alert: ServiceAbsentAccessPolicy - expr: absent(http_status_code_wp_home{namespace="intranet-staging"}) == 1 - for: 1m - labels: - severity: intranet-staging - annotations: - message: Namespace {{ $labels.namespace }} (homepage) is not returning a status code. - runbook_url: https://dsdmoj.atlassian.net/wiki/spaces/CDPT/pages/5124292758/Alerts+runbooks#ServiceAbsentAccessPolicy - dashboard_url: https://grafana.live.cloud-platform.service.justice.gov.uk/d/bdwyqxz07sxkwg/intranet-service?orgId=1&var-namespace=intranet-staging - - - alert: ServiceInsufficientHeaderHandling - expr: http_status_code_invalid_header{namespace="intranet-staging"} != 400 - for: 1m - labels: - severity: intranet-staging - annotations: - message: Namespace {{ $labels.namespace }} (invalid header) is returning an unexpected status code {{ printf "%0.0f" $value}}. - runbook_url: https://dsdmoj.atlassian.net/wiki/spaces/CDPT/pages/5124292758/Alerts+runbooks#ServiceInsufficientHeaderHandling - dashboard_url: https://grafana.live.cloud-platform.service.justice.gov.uk/d/bdwyqxz07sxkwg/intranet-service?orgId=1&var-namespace=intranet-staging diff --git a/deploy/staging/network-policy.yml b/deploy/staging/network-policy.yml deleted file mode 100644 index 671c35526..000000000 --- a/deploy/staging/network-policy.yml +++ /dev/null @@ -1,31 +0,0 @@ -kind: NetworkPolicy -apiVersion: networking.k8s.io/v1 -metadata: - name: allow-prometheus-scraping - namespace: intranet-staging -spec: - podSelector: - matchLabels: - app: intranet-staging - policyTypes: - - Ingress - ingress: - - from: - - namespaceSelector: - matchLabels: - component: monitoring ---- -kind: NetworkPolicy -apiVersion: networking.k8s.io/v1 -metadata: - name: allow-stability-inspector-dev - namespace: intranet-staging -spec: - podSelector: {} - policyTypes: - - Ingress - ingress: - - from: - - namespaceSelector: - matchLabels: - cloud-platform.justice.gov.uk/namespace: "stability-inspector-dev" diff --git a/deploy/staging/pod-monitor.yml b/deploy/staging/pod-monitor.yml deleted file mode 100644 index 6b36e4eaf..000000000 --- a/deploy/staging/pod-monitor.yml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PodMonitor -metadata: - name: intranet-staging - namespace: intranet-staging -spec: - selector: - matchLabels: - app: intranet-staging - podMetricsEndpoints: - - port: http - path: "/metrics/fpm" - interval: 15s diff --git a/deploy/staging/service-monitor.yml b/deploy/staging/service-monitor.yml deleted file mode 100644 index be71dfd02..000000000 --- a/deploy/staging/service-monitor.yml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: intranet-staging - namespace: intranet-staging -spec: - selector: - matchLabels: - app: intranet-staging - endpoints: - - port: http - interval: 15s - path: /metrics/service