diff --git a/kutegen b/kutegen index 96f9233da..c89b4b3b 160000 --- a/kutegen +++ b/kutegen @@ -1 +1 @@ -Subproject commit 96f9233da2a4e7a5b13e87100d2bd953cddcd2ca +Subproject commit c89b4b3bb516fb73dedf8fca5ba89778fe095bf1 diff --git a/src/test/resources/fixtures/kube_objects/kube_object_alb.json b/src/test/resources/fixtures/kube_objects/kube_object_alb.json index ca83e19d..c9291db9 100644 --- a/src/test/resources/fixtures/kube_objects/kube_object_alb.json +++ b/src/test/resources/fixtures/kube_objects/kube_object_alb.json @@ -427,7 +427,7 @@ "description": "Namespace: dev-internal, AppName: test-app-navi-service; Pod restarted multiple times", "runbook": "https:\/\/navihq.atlassian.net\/wiki\/spaces\/IN\/pages\/279937094\/Act+On+Pod+Alert" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "severity": "critical", "appName": "test-app-navi-service", diff --git a/src/test/resources/fixtures/kube_objects/kube_object_alb_redirect.json b/src/test/resources/fixtures/kube_objects/kube_object_alb_redirect.json index f9c75433..c40e9028 100644 --- a/src/test/resources/fixtures/kube_objects/kube_object_alb_redirect.json +++ b/src/test/resources/fixtures/kube_objects/kube_object_alb_redirect.json @@ -447,7 +447,7 @@ "description": "Namespace: dev-internal, AppName: test-app-navi-service; Pod restarted multiple times", "runbook": "https:\/\/navihq.atlassian.net\/wiki\/spaces\/IN\/pages\/279937094\/Act+On+Pod+Alert" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "severity": "critical", "appName": "test-app-navi-service", diff --git a/src/test/resources/fixtures/kube_objects/kube_object_alb_sg.json b/src/test/resources/fixtures/kube_objects/kube_object_alb_sg.json index 0430c807..ccd4ccec 100644 --- a/src/test/resources/fixtures/kube_objects/kube_object_alb_sg.json +++ b/src/test/resources/fixtures/kube_objects/kube_object_alb_sg.json @@ -436,7 +436,7 @@ "description": "Namespace: dev-internal, AppName: test-app-navi-service; Pod restarted multiple times", "runbook": "https:\/\/navihq.atlassian.net\/wiki\/spaces\/IN\/pages\/279937094\/Act+On+Pod+Alert" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "severity": "critical", "appName": "test-app-navi-service", diff --git a/src/test/resources/fixtures/kube_objects/kube_object_ciliumNetPols.json b/src/test/resources/fixtures/kube_objects/kube_object_ciliumNetPols.json index b63d9b29..481693a2 100644 --- a/src/test/resources/fixtures/kube_objects/kube_object_ciliumNetPols.json +++ b/src/test/resources/fixtures/kube_objects/kube_object_ciliumNetPols.json @@ -451,7 +451,7 @@ "runbook": "https://navihq.atlassian.net/wiki/spaces/IN/pages/279937094/Act+On+Pod+Alert", "summary": "High Pod Restarts" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev\", pod=~\"test-cilium-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev\", pod=~\"test-cilium-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "alertTeam": "Infra", "appName": "test-cilium-navi-service", diff --git a/src/test/resources/fixtures/kube_objects/kube_object_commonapigateways.json b/src/test/resources/fixtures/kube_objects/kube_object_commonapigateways.json index f282ad27..81294e4a 100644 --- a/src/test/resources/fixtures/kube_objects/kube_object_commonapigateways.json +++ b/src/test/resources/fixtures/kube_objects/kube_object_commonapigateways.json @@ -336,7 +336,7 @@ "runbook": "https://navihq.atlassian.net/wiki/spaces/IN/pages/279937094/Act+On+Pod+Alert", "summary": "High Pod Restarts" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"infrastructure\", pod=~\"test-commonapigateways-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"infrastructure\", pod=~\"test-commonapigateways-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "alertTeam": "Infra", "appName": "test-commonapigateways-navi-service", diff --git a/src/test/resources/fixtures/kube_objects/kube_object_complete_e2e.json b/src/test/resources/fixtures/kube_objects/kube_object_complete_e2e.json index aef67310..4ff0de58 100644 --- a/src/test/resources/fixtures/kube_objects/kube_object_complete_e2e.json +++ b/src/test/resources/fixtures/kube_objects/kube_object_complete_e2e.json @@ -482,7 +482,7 @@ "description": "Namespace: dev-internal, AppName: test-app-navi-service; Pod restarted multiple times", "runbook": "https://navihq.atlassian.net/wiki/spaces/IN/pages/279937094/Act+On+Pod+Alert" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "severity": "critical", "appName": "test-app-navi-service", diff --git a/src/test/resources/fixtures/kube_objects/kube_object_custom_alerts.json b/src/test/resources/fixtures/kube_objects/kube_object_custom_alerts.json index 4a0271c1..93ddee47 100644 --- a/src/test/resources/fixtures/kube_objects/kube_object_custom_alerts.json +++ b/src/test/resources/fixtures/kube_objects/kube_object_custom_alerts.json @@ -322,7 +322,7 @@ "description": "Namespace: dev-internal, AppName: test-app-navi-service; Pod restarted multiple times", "runbook": "https:\/\/navihq.atlassian.net\/wiki\/spaces\/IN\/pages\/279937094\/Act+On+Pod+Alert" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "severity": "critical", "appName": "test-app-navi-service", diff --git a/src/test/resources/fixtures/kube_objects/kube_object_default_alerts.json b/src/test/resources/fixtures/kube_objects/kube_object_default_alerts.json index 67560519..da31d025 100644 --- a/src/test/resources/fixtures/kube_objects/kube_object_default_alerts.json +++ b/src/test/resources/fixtures/kube_objects/kube_object_default_alerts.json @@ -497,7 +497,7 @@ "description": "Namespace: dev-internal, AppName: test-app-navi-service; Pod restarted multiple times", "runbook": "https:\/\/navihq.atlassian.net\/wiki\/spaces\/IN\/pages\/279937094\/Act+On+Pod+Alert" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "severity": "critical", "appName": "test-app-navi-service", diff --git a/src/test/resources/fixtures/kube_objects/kube_object_e2e.json b/src/test/resources/fixtures/kube_objects/kube_object_e2e.json index 955fceff..3b9e6b80 100644 --- a/src/test/resources/fixtures/kube_objects/kube_object_e2e.json +++ b/src/test/resources/fixtures/kube_objects/kube_object_e2e.json @@ -448,7 +448,7 @@ "summary": "High Pod Restarts", "description": "Namespace: dev-internal, AppName: test-app-navi-service; Pod restarted multiple times" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "severity": "critical", "appName": "test-app-navi-service", diff --git a/src/test/resources/fixtures/kube_objects/kube_object_efs_pvc.json b/src/test/resources/fixtures/kube_objects/kube_object_efs_pvc.json index 98180782..3e6069d4 100644 --- a/src/test/resources/fixtures/kube_objects/kube_object_efs_pvc.json +++ b/src/test/resources/fixtures/kube_objects/kube_object_efs_pvc.json @@ -445,7 +445,7 @@ "description": "Namespace: dev-internal, AppName: test-app-navi-service; Pod restarted multiple times", "runbook": "https:\/\/navihq.atlassian.net\/wiki\/spaces\/IN\/pages\/279937094\/Act+On+Pod+Alert" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "severity": "critical", "appName": "test-app-navi-service", diff --git a/src/test/resources/fixtures/kube_objects/kube_object_elb.json b/src/test/resources/fixtures/kube_objects/kube_object_elb.json index e1439b61..b87ebcfe 100644 --- a/src/test/resources/fixtures/kube_objects/kube_object_elb.json +++ b/src/test/resources/fixtures/kube_objects/kube_object_elb.json @@ -340,7 +340,7 @@ "description": "Namespace: dev-internal, AppName: test-app-navi-service; Pod restarted multiple times", "runbook": "https:\/\/navihq.atlassian.net\/wiki\/spaces\/IN\/pages\/279937094\/Act+On+Pod+Alert" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "severity": "critical", "appName": "test-app-navi-service", diff --git a/src/test/resources/fixtures/kube_objects/kube_object_fsx.json b/src/test/resources/fixtures/kube_objects/kube_object_fsx.json index 0462ea4c..a2af9e81 100644 --- a/src/test/resources/fixtures/kube_objects/kube_object_fsx.json +++ b/src/test/resources/fixtures/kube_objects/kube_object_fsx.json @@ -445,7 +445,7 @@ "description": "Namespace: dev-internal, AppName: test-app-navi-service; Pod restarted multiple times", "runbook": "https:\/\/navihq.atlassian.net\/wiki\/spaces\/IN\/pages\/279937094\/Act+On+Pod+Alert" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "severity": "critical", "appName": "test-app-navi-service", diff --git a/src/test/resources/fixtures/kube_objects/kube_object_otel.json b/src/test/resources/fixtures/kube_objects/kube_object_otel.json index 175b83e0..73c33899 100644 --- a/src/test/resources/fixtures/kube_objects/kube_object_otel.json +++ b/src/test/resources/fixtures/kube_objects/kube_object_otel.json @@ -429,7 +429,7 @@ "description": "Namespace: dev-internal, AppName: test-app-navi-service; Pod restarted multiple times", "runbook": "https:\/\/navihq.atlassian.net\/wiki\/spaces\/IN\/pages\/279937094\/Act+On+Pod+Alert" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "severity": "critical", "appName": "test-app-navi-service", diff --git a/src/test/resources/fixtures/kube_objects/kube_object_prod_tsc.json b/src/test/resources/fixtures/kube_objects/kube_object_prod_tsc.json index cb0c9048..30274ab6 100644 --- a/src/test/resources/fixtures/kube_objects/kube_object_prod_tsc.json +++ b/src/test/resources/fixtures/kube_objects/kube_object_prod_tsc.json @@ -346,7 +346,7 @@ "runbook": "https://navihq.atlassian.net/wiki/spaces/IN/pages/279937094/Act+On+Pod+Alert", "summary": "High Pod Restarts" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"prod\", pod=~\"testapp-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"prod\", pod=~\"testapp-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "alertTeam": "Infra", "appName": "testapp-navi-service", diff --git a/src/test/resources/fixtures/kube_objects/kube_object_prod_with_maxsurge.json b/src/test/resources/fixtures/kube_objects/kube_object_prod_with_maxsurge.json index e6d402f5..f9ccbc84 100644 --- a/src/test/resources/fixtures/kube_objects/kube_object_prod_with_maxsurge.json +++ b/src/test/resources/fixtures/kube_objects/kube_object_prod_with_maxsurge.json @@ -346,7 +346,7 @@ "runbook": "https://navihq.atlassian.net/wiki/spaces/IN/pages/279937094/Act+On+Pod+Alert", "summary": "High Pod Restarts" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"prod\", pod=~\"testapp-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"prod\", pod=~\"testapp-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "alertTeam": "Infra", "appName": "testapp-navi-service", diff --git a/src/test/resources/fixtures/kube_objects/kube_object_rollout_blue_green.json b/src/test/resources/fixtures/kube_objects/kube_object_rollout_blue_green.json index 73ceb7cc..60bc29a1 100644 --- a/src/test/resources/fixtures/kube_objects/kube_object_rollout_blue_green.json +++ b/src/test/resources/fixtures/kube_objects/kube_object_rollout_blue_green.json @@ -468,7 +468,7 @@ "runbook": "https://navihq.atlassian.net/wiki/spaces/IN/pages/279937094/Act+On+Pod+Alert", "summary": "High Pod Restarts" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev\", pod=~\"bluegreen-one-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev\", pod=~\"bluegreen-one-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "alertTeam": "Infra", "appName": "bluegreen-one-navi-service", diff --git a/src/test/resources/fixtures/kube_objects/kube_object_scylla_cluster.json b/src/test/resources/fixtures/kube_objects/kube_object_scylla_cluster.json index 998f1d08..001c66b5 100644 --- a/src/test/resources/fixtures/kube_objects/kube_object_scylla_cluster.json +++ b/src/test/resources/fixtures/kube_objects/kube_object_scylla_cluster.json @@ -1043,7 +1043,7 @@ "runbook": "https://navihq.atlassian.net/wiki/spaces/IN/pages/279937094/Act+On+Pod+Alert", "summary": "High Pod Restarts" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev\", pod=~\"scylla-test-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev\", pod=~\"scylla-test-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "alertTeam": "Infra", "appName": "scylla-test-navi-service", diff --git a/src/test/resources/fixtures/kube_objects/kube_object_sharedAlb.json b/src/test/resources/fixtures/kube_objects/kube_object_sharedAlb.json index b231dbbb..c4a65ec5 100644 --- a/src/test/resources/fixtures/kube_objects/kube_object_sharedAlb.json +++ b/src/test/resources/fixtures/kube_objects/kube_object_sharedAlb.json @@ -393,7 +393,7 @@ "description": "Namespace: dev-internal, AppName: test-app-navi-service; Pod restarted multiple times", "runbook": "https:\/\/navihq.atlassian.net\/wiki\/spaces\/IN\/pages\/279937094\/Act+On+Pod+Alert" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "severity": "critical", "appName": "test-app-navi-service", diff --git a/src/test/resources/fixtures/kube_objects/kube_object_sharedAlbAcrossNamespace.json b/src/test/resources/fixtures/kube_objects/kube_object_sharedAlbAcrossNamespace.json index b8675dae..efc43a14 100644 --- a/src/test/resources/fixtures/kube_objects/kube_object_sharedAlbAcrossNamespace.json +++ b/src/test/resources/fixtures/kube_objects/kube_object_sharedAlbAcrossNamespace.json @@ -393,7 +393,7 @@ "description": "Namespace: dev-internal, AppName: test-app-navi-service; Pod restarted multiple times", "runbook": "https:\/\/navihq.atlassian.net\/wiki\/spaces\/IN\/pages\/279937094\/Act+On+Pod+Alert" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "severity": "critical", "appName": "test-app-navi-service", diff --git a/src/test/resources/fixtures/kube_objects/kube_object_sharedAlb_prod.json b/src/test/resources/fixtures/kube_objects/kube_object_sharedAlb_prod.json index 57d70eb5..89288e11 100644 --- a/src/test/resources/fixtures/kube_objects/kube_object_sharedAlb_prod.json +++ b/src/test/resources/fixtures/kube_objects/kube_object_sharedAlb_prod.json @@ -384,7 +384,7 @@ "runbook": "https://navihq.atlassian.net/wiki/spaces/IN/pages/279937094/Act+On+Pod+Alert", "summary": "High Pod Restarts" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"prod-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"prod-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "alertTeam": "Infra", "appName": "test-app-navi-service", diff --git a/src/test/resources/fixtures/kube_objects/kube_object_test_perf.json b/src/test/resources/fixtures/kube_objects/kube_object_test_perf.json index d0f5d550..33b49824 100644 --- a/src/test/resources/fixtures/kube_objects/kube_object_test_perf.json +++ b/src/test/resources/fixtures/kube_objects/kube_object_test_perf.json @@ -731,7 +731,7 @@ "runbook": "https://navihq.atlassian.net/wiki/spaces/IN/pages/279937094/Act+On+Pod+Alert", "summary": "High Pod Restarts" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"perf\", pod=~\"test-perf-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"perf\", pod=~\"test-perf-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "alertTeam": "Infra", "appName": "test-perf-navi-service", diff --git a/src/test/resources/fixtures/kube_objects/sandbox/expected_output/kube_object_alb.json b/src/test/resources/fixtures/kube_objects/sandbox/expected_output/kube_object_alb.json index 24a798d0..20bb8828 100644 --- a/src/test/resources/fixtures/kube_objects/sandbox/expected_output/kube_object_alb.json +++ b/src/test/resources/fixtures/kube_objects/sandbox/expected_output/kube_object_alb.json @@ -437,7 +437,7 @@ "description": "Namespace: dev-internal, AppName: test-app-navi-service; Pod restarted multiple times", "runbook": "https:\/\/navihq.atlassian.net\/wiki\/spaces\/IN\/pages\/279937094\/Act+On+Pod+Alert" }, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod) > 3", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=\"dev-internal\", pod=~\"test-app-navi-service.*\"}[30m])) by (reason, pod, namespace) > 3", "labels": { "severity": "critical", "appName": "test-app-navi-service",