Merge pull request #211 from appuio/fix/alertmanager-no-gossip-netpol

Fix alertmanager-allow-web networkpolicy
appuio · Aug 5, 2024 · 947e2ea · 947e2ea
2 parents df8b8a1 + b222167
commit 947e2ea
Show file tree

Hide file tree

Showing 24 changed files with 69 additions and 68 deletions.
diff --git a/component/networkpolicy.libsonnet b/component/networkpolicy.libsonnet
@@ -36,8 +36,6 @@ local params = inv.parameters.openshift4_monitoring;
               port: 9097,
             },
           ],
-        },
-        {
           from: [
             {
               namespaceSelector: {},

diff --git a/...alerts-with-node-labels/openshift4-monitoring/openshift4-monitoring/20_networkpolicy.yaml b/...alerts-with-node-labels/openshift4-monitoring/openshift4-monitoring/20_networkpolicy.yaml
@@ -8,7 +8,9 @@ metadata:
   namespace: openshift-monitoring
 spec:
   ingress:
-    - ports:
+    - from:
+        - namespaceSelector: {}
+      ports:
         - port: 9092
           protocol: TCP
         - port: 9093
@@ -17,8 +19,6 @@ spec:
           protocol: TCP
         - port: 9097
           protocol: TCP
-    - from:
-        - namespaceSelector: {}
   podSelector:
     matchLabels:
       app.kubernetes.io/name: alertmanager

diff --git a/...de-labels/openshift4-monitoring/openshift4-monitoring/20_user_workload_networkpolicy.yaml b/...de-labels/openshift4-monitoring/openshift4-monitoring/20_user_workload_networkpolicy.yaml
@@ -8,7 +8,9 @@ metadata:
   namespace: openshift-user-workload-monitoring
 spec:
   ingress:
-    - ports:
+    - from:
+        - namespaceSelector: {}
+      ports:
         - port: 9092
           protocol: TCP
         - port: 9093
@@ -17,8 +19,6 @@ spec:
           protocol: TCP
         - port: 9097
           protocol: TCP
-    - from:
-        - namespaceSelector: {}
   podSelector:
     matchLabels:
       app.kubernetes.io/name: alertmanager

diff --git a/.../golden/capacity-alerts/openshift4-monitoring/openshift4-monitoring/20_networkpolicy.yaml b/.../golden/capacity-alerts/openshift4-monitoring/openshift4-monitoring/20_networkpolicy.yaml
@@ -8,7 +8,9 @@ metadata:
   namespace: openshift-monitoring
 spec:
   ingress:
-    - ports:
+    - from:
+        - namespaceSelector: {}
+      ports:
         - port: 9092
           protocol: TCP
         - port: 9093
@@ -17,8 +19,6 @@ spec:
           protocol: TCP
         - port: 9097
           protocol: TCP
-    - from:
-        - namespaceSelector: {}
   podSelector:
     matchLabels:
       app.kubernetes.io/name: alertmanager

diff --git a/...ty-alerts/openshift4-monitoring/openshift4-monitoring/20_user_workload_networkpolicy.yaml b/...ty-alerts/openshift4-monitoring/openshift4-monitoring/20_user_workload_networkpolicy.yaml
@@ -8,7 +8,9 @@ metadata:
   namespace: openshift-user-workload-monitoring
 spec:
   ingress:
-    - ports:
+    - from:
+        - namespaceSelector: {}
+      ports:
         - port: 9092
           protocol: TCP
         - port: 9093
@@ -17,8 +19,6 @@ spec:
           protocol: TCP
         - port: 9097
           protocol: TCP
-    - from:
-        - namespaceSelector: {}
   podSelector:
     matchLabels:
       app.kubernetes.io/name: alertmanager

diff --git a/tests/golden/custom-rules/openshift4-monitoring/openshift4-monitoring/20_networkpolicy.yaml b/tests/golden/custom-rules/openshift4-monitoring/openshift4-monitoring/20_networkpolicy.yaml
@@ -8,7 +8,9 @@ metadata:
   namespace: openshift-monitoring
 spec:
   ingress:
-    - ports:
+    - from:
+        - namespaceSelector: {}
+      ports:
         - port: 9092
           protocol: TCP
         - port: 9093
@@ -17,8 +19,6 @@ spec:
           protocol: TCP
         - port: 9097
           protocol: TCP
-    - from:
-        - namespaceSelector: {}
   podSelector:
     matchLabels:
       app.kubernetes.io/name: alertmanager

diff --git a/...tom-rules/openshift4-monitoring/openshift4-monitoring/20_user_workload_networkpolicy.yaml b/...tom-rules/openshift4-monitoring/openshift4-monitoring/20_user_workload_networkpolicy.yaml
@@ -8,7 +8,9 @@ metadata:
   namespace: openshift-user-workload-monitoring
 spec:
   ingress:
-    - ports:
+    - from:
+        - namespaceSelector: {}
+      ports:
         - port: 9092
           protocol: TCP
         - port: 9093
@@ -17,8 +19,6 @@ spec:
           protocol: TCP
         - port: 9097
           protocol: TCP
-    - from:
-        - namespaceSelector: {}
   podSelector:
     matchLabels:
       app.kubernetes.io/name: alertmanager

diff --git a/...s/golden/ovn-kubernetes/openshift4-monitoring/openshift4-monitoring/20_networkpolicy.yaml b/...s/golden/ovn-kubernetes/openshift4-monitoring/openshift4-monitoring/20_networkpolicy.yaml
@@ -8,7 +8,9 @@ metadata:
   namespace: openshift-monitoring
 spec:
   ingress:
-    - ports:
+    - from:
+        - namespaceSelector: {}
+      ports:
         - port: 9092
           protocol: TCP
         - port: 9093
@@ -17,8 +19,6 @@ spec:
           protocol: TCP
         - port: 9097
           protocol: TCP
-    - from:
-        - namespaceSelector: {}
   podSelector:
     matchLabels:
       app.kubernetes.io/name: alertmanager

diff --git a/...ubernetes/openshift4-monitoring/openshift4-monitoring/20_user_workload_networkpolicy.yaml b/...ubernetes/openshift4-monitoring/openshift4-monitoring/20_user_workload_networkpolicy.yaml
@@ -8,7 +8,9 @@ metadata:
   namespace: openshift-user-workload-monitoring
 spec:
   ingress:
-    - ports:
+    - from:
+        - namespaceSelector: {}
+      ports:
         - port: 9092
           protocol: TCP
         - port: 9093
@@ -17,8 +19,6 @@ spec:
           protocol: TCP
         - port: 9097
           protocol: TCP
-    - from:
-        - namespaceSelector: {}
   podSelector:
     matchLabels:
       app.kubernetes.io/name: alertmanager

diff --git a/tests/golden/release-4.13/openshift4-monitoring/openshift4-monitoring/20_networkpolicy.yaml b/tests/golden/release-4.13/openshift4-monitoring/openshift4-monitoring/20_networkpolicy.yaml
@@ -8,7 +8,9 @@ metadata:
   namespace: openshift-monitoring
 spec:
   ingress:
-    - ports:
+    - from:
+        - namespaceSelector: {}
+      ports:
         - port: 9092
           protocol: TCP
         - port: 9093
@@ -17,8 +19,6 @@ spec:
           protocol: TCP
         - port: 9097
           protocol: TCP
-    - from:
-        - namespaceSelector: {}
   podSelector:
     matchLabels:
       app.kubernetes.io/name: alertmanager

diff --git a/...ease-4.13/openshift4-monitoring/openshift4-monitoring/20_user_workload_networkpolicy.yaml b/...ease-4.13/openshift4-monitoring/openshift4-monitoring/20_user_workload_networkpolicy.yaml
@@ -8,7 +8,9 @@ metadata:
   namespace: openshift-user-workload-monitoring
 spec:
   ingress:
-    - ports:
+    - from:
+        - namespaceSelector: {}
+      ports:
         - port: 9092
           protocol: TCP
         - port: 9093
@@ -17,8 +19,6 @@ spec:
           protocol: TCP
         - port: 9097
           protocol: TCP
-    - from:
-        - namespaceSelector: {}
   podSelector:
     matchLabels:
       app.kubernetes.io/name: alertmanager

diff --git a/tests/golden/release-4.14/openshift4-monitoring/openshift4-monitoring/20_networkpolicy.yaml b/tests/golden/release-4.14/openshift4-monitoring/openshift4-monitoring/20_networkpolicy.yaml
@@ -8,7 +8,9 @@ metadata:
   namespace: openshift-monitoring
 spec:
   ingress:
-    - ports:
+    - from:
+        - namespaceSelector: {}
+      ports:
         - port: 9092
           protocol: TCP
         - port: 9093
@@ -17,8 +19,6 @@ spec:
           protocol: TCP
         - port: 9097
           protocol: TCP
-    - from:
-        - namespaceSelector: {}
   podSelector:
     matchLabels:
       app.kubernetes.io/name: alertmanager

diff --git a/...ease-4.14/openshift4-monitoring/openshift4-monitoring/20_user_workload_networkpolicy.yaml b/...ease-4.14/openshift4-monitoring/openshift4-monitoring/20_user_workload_networkpolicy.yaml
@@ -8,7 +8,9 @@ metadata:
   namespace: openshift-user-workload-monitoring
 spec:
   ingress:
-    - ports:
+    - from:
+        - namespaceSelector: {}
+      ports:
         - port: 9092
           protocol: TCP
         - port: 9093
@@ -17,8 +19,6 @@ spec:
           protocol: TCP
         - port: 9097
           protocol: TCP
-    - from:
-        - namespaceSelector: {}
   podSelector:
     matchLabels:
       app.kubernetes.io/name: alertmanager

diff --git a/tests/golden/release-4.14/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml b/tests/golden/release-4.14/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
@@ -2022,6 +2022,7 @@ spec:
             description: Prometheus {{$labels.namespace}}/{{$labels.pod}} failed to
               send {{ printf "%.1f" $value }}% of the samples to {{ $labels.remote_name}}:{{
               $labels.url }}
+            runbook_url: https://github.com/openshift/runbooks/blob/master/alerts/cluster-monitoring-operator/PrometheusRemoteStorageFailures.md
             summary: Prometheus fails to send samples to remote storage.
             syn_component: openshift4-monitoring
           expr: |
@@ -2097,6 +2098,7 @@ spec:
             description: Prometheus {{$labels.namespace}}/{{$labels.pod}} has failed
               {{ printf "%.0f" $value }} scrapes in the last 5m because some targets
               exceeded the configured body_size_limit.
+            runbook_url: https://github.com/openshift/runbooks/blob/master/alerts/cluster-monitoring-operator/PrometheusScrapeBodySizeLimitHit.md
             summary: Prometheus has dropped some targets that exceeded body size limit.
             syn_component: openshift4-monitoring
           expr: |
@@ -2210,6 +2212,7 @@ spec:
             description: Prometheus operator in {{ $labels.namespace }} namespace
               rejected {{ printf "%0.0f" $value }} {{ $labels.controller }}/{{ $labels.resource
               }} resources.
+            runbook_url: https://github.com/openshift/runbooks/blob/master/alerts/cluster-monitoring-operator/PrometheusOperatorRejectedResources.md
             summary: Resources rejected by Prometheus operator
             syn_component: openshift4-monitoring
           expr: |

diff --git a/tests/golden/release-4.15/openshift4-monitoring/openshift4-monitoring/20_networkpolicy.yaml b/tests/golden/release-4.15/openshift4-monitoring/openshift4-monitoring/20_networkpolicy.yaml
@@ -8,7 +8,9 @@ metadata:
   namespace: openshift-monitoring
 spec:
   ingress:
-    - ports:
+    - from:
+        - namespaceSelector: {}
+      ports:
         - port: 9092
           protocol: TCP
         - port: 9093
@@ -17,8 +19,6 @@ spec:
           protocol: TCP
         - port: 9097
           protocol: TCP
-    - from:
-        - namespaceSelector: {}
   podSelector:
     matchLabels:
       app.kubernetes.io/name: alertmanager

diff --git a/...ease-4.15/openshift4-monitoring/openshift4-monitoring/20_user_workload_networkpolicy.yaml b/...ease-4.15/openshift4-monitoring/openshift4-monitoring/20_user_workload_networkpolicy.yaml
@@ -8,7 +8,9 @@ metadata:
   namespace: openshift-user-workload-monitoring
 spec:
   ingress:
-    - ports:
+    - from:
+        - namespaceSelector: {}
+      ports:
         - port: 9092
           protocol: TCP
         - port: 9093
@@ -17,8 +19,6 @@ spec:
           protocol: TCP
         - port: 9097
           protocol: TCP
-    - from:
-        - namespaceSelector: {}
   podSelector:
     matchLabels:
       app.kubernetes.io/name: alertmanager

diff --git a/tests/golden/remote-write/openshift4-monitoring/openshift4-monitoring/20_networkpolicy.yaml b/tests/golden/remote-write/openshift4-monitoring/openshift4-monitoring/20_networkpolicy.yaml
@@ -8,7 +8,9 @@ metadata:
   namespace: openshift-monitoring
 spec:
   ingress:
-    - ports:
+    - from:
+        - namespaceSelector: {}
+      ports:
         - port: 9092
           protocol: TCP
         - port: 9093
@@ -17,8 +19,6 @@ spec:
           protocol: TCP
         - port: 9097
           protocol: TCP
-    - from:
-        - namespaceSelector: {}
   podSelector:
     matchLabels:
       app.kubernetes.io/name: alertmanager

diff --git a/...ote-write/openshift4-monitoring/openshift4-monitoring/20_user_workload_networkpolicy.yaml b/...ote-write/openshift4-monitoring/openshift4-monitoring/20_user_workload_networkpolicy.yaml
@@ -8,7 +8,9 @@ metadata:
   namespace: openshift-user-workload-monitoring
 spec:
   ingress:
-    - ports:
+    - from:
+        - namespaceSelector: {}
+      ports:
         - port: 9092
           protocol: TCP
         - port: 9093
@@ -17,8 +19,6 @@ spec:
           protocol: TCP
         - port: 9097
           protocol: TCP
-    - from:
-        - namespaceSelector: {}
   podSelector:
     matchLabels:
       app.kubernetes.io/name: alertmanager

diff --git a/tests/golden/team-routing/openshift4-monitoring/openshift4-monitoring/20_networkpolicy.yaml b/tests/golden/team-routing/openshift4-monitoring/openshift4-monitoring/20_networkpolicy.yaml
@@ -8,7 +8,9 @@ metadata:
   namespace: openshift-monitoring
 spec:
   ingress:
-    - ports:
+    - from:
+        - namespaceSelector: {}
+      ports:
         - port: 9092
           protocol: TCP
         - port: 9093
@@ -17,8 +19,6 @@ spec:
           protocol: TCP
         - port: 9097
           protocol: TCP
-    - from:
-        - namespaceSelector: {}
   podSelector:
     matchLabels:
       app.kubernetes.io/name: alertmanager

diff --git a/...m-routing/openshift4-monitoring/openshift4-monitoring/20_user_workload_networkpolicy.yaml b/...m-routing/openshift4-monitoring/openshift4-monitoring/20_user_workload_networkpolicy.yaml
@@ -8,7 +8,9 @@ metadata:
   namespace: openshift-user-workload-monitoring
 spec:
   ingress:
-    - ports:
+    - from:
+        - namespaceSelector: {}
+      ports:
         - port: 9092
           protocol: TCP
         - port: 9093
@@ -17,8 +19,6 @@ spec:
           protocol: TCP
         - port: 9097
           protocol: TCP
-    - from:
-        - namespaceSelector: {}
   podSelector:
     matchLabels:
       app.kubernetes.io/name: alertmanager
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,8 +36,6 @@ local params = inv.parameters.openshift4_monitoring; @@
                   port: 9097,
                 },
               ],
-            },
-            {
               from: [
                 {
                   namespaceSelector: {},
@@ Expand Down @@