From c72a4fe1bd99951744ac0b3c0391a337a30515f4 Mon Sep 17 00:00:00 2001 From: Quentin Manfroi Date: Tue, 22 Jan 2019 13:43:55 +0100 Subject: [PATCH] MON-386 move ingress to specific vts sub directory --- caas/kubernetes/ingress/{ => vts}/README.md | 4 +++- caas/kubernetes/ingress/{ => vts}/inputs.tf | 0 caas/kubernetes/ingress/{ => vts}/modules.tf | 0 caas/kubernetes/ingress/{ => vts}/monitors-ingress.tf | 0 caas/kubernetes/ingress/{ => vts}/outputs.tf | 0 5 files changed, 3 insertions(+), 1 deletion(-) rename caas/kubernetes/ingress/{ => vts}/README.md (95%) rename caas/kubernetes/ingress/{ => vts}/inputs.tf (100%) rename caas/kubernetes/ingress/{ => vts}/modules.tf (100%) rename caas/kubernetes/ingress/{ => vts}/monitors-ingress.tf (100%) rename caas/kubernetes/ingress/{ => vts}/outputs.tf (100%) diff --git a/caas/kubernetes/ingress/README.md b/caas/kubernetes/ingress/vts/README.md similarity index 95% rename from caas/kubernetes/ingress/README.md rename to caas/kubernetes/ingress/vts/README.md index 78165d0..fe900d4 100644 --- a/caas/kubernetes/ingress/README.md +++ b/caas/kubernetes/ingress/vts/README.md @@ -63,7 +63,9 @@ https://github.com/kubernetes/ingress-nginx/pull/423/commits/1d38e3a38425f08de2f Nginx Ingress Controller setup ------------------------------ -This configuration and monitors only works for ingress controller >= 0.10 and <= 0.15. +This configuration and monitors only work for ingress controller version : +- >= 0.10 because ingress is beta before that and metrics naming convention not stable +- <= 0.15 because ingress does not use VTS metrics since 0.16 Enable the following flags in the Nginx Ingress Controller chart controller.stats.enabled=true,controller.metrics.enabled=true and the following Datadog agent configuration for each ingress controller: diff --git a/caas/kubernetes/ingress/inputs.tf b/caas/kubernetes/ingress/vts/inputs.tf similarity index 100% rename from caas/kubernetes/ingress/inputs.tf rename to caas/kubernetes/ingress/vts/inputs.tf diff --git a/caas/kubernetes/ingress/modules.tf b/caas/kubernetes/ingress/vts/modules.tf similarity index 100% rename from caas/kubernetes/ingress/modules.tf rename to caas/kubernetes/ingress/vts/modules.tf diff --git a/caas/kubernetes/ingress/monitors-ingress.tf b/caas/kubernetes/ingress/vts/monitors-ingress.tf similarity index 100% rename from caas/kubernetes/ingress/monitors-ingress.tf rename to caas/kubernetes/ingress/vts/monitors-ingress.tf diff --git a/caas/kubernetes/ingress/outputs.tf b/caas/kubernetes/ingress/vts/outputs.tf similarity index 100% rename from caas/kubernetes/ingress/outputs.tf rename to caas/kubernetes/ingress/vts/outputs.tf