From ef7edb62c18157b0079fc6f19a19b9dac63f792e Mon Sep 17 00:00:00 2001 From: Quentin Manfroi Date: Thu, 25 Apr 2019 18:59:17 +0200 Subject: [PATCH] MON-441 update existing monitors using excluded extra tags --- caas/kubernetes/ingress/vts/modules.tf | 8 +++++--- caas/kubernetes/pod/modules.tf | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/caas/kubernetes/ingress/vts/modules.tf b/caas/kubernetes/ingress/vts/modules.tf index 288bd39..dac7f45 100644 --- a/caas/kubernetes/ingress/vts/modules.tf +++ b/caas/kubernetes/ingress/vts/modules.tf @@ -6,7 +6,7 @@ module "filter-tags" { filter_tags_use_defaults = "${var.filter_tags_use_defaults}" filter_tags_custom = "${var.filter_tags_custom}" filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" - extra_tags = ["!upstream:upstream-default-backend"] + extra_tags_excluded = ["upstream:upstream-default-backend"] } module "filter-tags-5xx" { @@ -17,7 +17,8 @@ module "filter-tags-5xx" { filter_tags_use_defaults = "${var.filter_tags_use_defaults}" filter_tags_custom = "${var.filter_tags_custom}" filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" - extra_tags = ["!upstream:upstream-default-backend,status_code:5xx"] + extra_tags = ["status_code:5xx"] + extra_tags_excluded = ["upstream:upstream-default-backend"] } module "filter-tags-4xx" { @@ -28,5 +29,6 @@ module "filter-tags-4xx" { filter_tags_use_defaults = "${var.filter_tags_use_defaults}" filter_tags_custom = "${var.filter_tags_custom}" filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" - extra_tags = ["!upstream:upstream-default-backend,status_code:4xx"] + extra_tags = ["status_code:4xx"] + extra_tags_excluded = ["upstream:upstream-default-backend"] } diff --git a/caas/kubernetes/pod/modules.tf b/caas/kubernetes/pod/modules.tf index 9232867..72b5b69 100644 --- a/caas/kubernetes/pod/modules.tf +++ b/caas/kubernetes/pod/modules.tf @@ -16,7 +16,7 @@ module "filter-tags-phase" { filter_tags_use_defaults = "${var.filter_tags_use_defaults}" filter_tags_custom = "${var.filter_tags_custom}" filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" - extra_tags = ["!phase:pending,!phase:running,!phase:succeeded,!phase:unknown"] + extra_tags_excluded = ["phase:pending,phase:running,phase:succeeded,phase:unknown"] } module "filter-tags-nocrashloopbackoff" { @@ -27,7 +27,7 @@ module "filter-tags-nocrashloopbackoff" { filter_tags_use_defaults = "${var.filter_tags_use_defaults}" filter_tags_custom = "${var.filter_tags_custom}" filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}" - extra_tags = ["!reason:crashloopbackoff"] + extra_tags_excluded = ["reason:crashloopbackoff"] } module "filter-tags-crashloopbackoff" {