From 6918b46cb93fd02d3c00d3360c404f32e052e379 Mon Sep 17 00:00:00 2001 From: Quentin Manfroi Date: Thu, 18 Apr 2019 12:55:17 +0200 Subject: [PATCH 1/3] MON-437 update main readme --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d71a4ec..f53836a 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,12 @@ This repository is used to store all our monitors templates ready to use for gen First, you may refresh your knowledge and look at the [terminology](https://confluence.fr.clara.net/display/DAT/Getting+started). -To contribute you will need to [report an issue](https://confluence.fr.clara.net/display/DAT/Project+and+Workflow). +To contribute you will need to [report an issue](https://confluence.fr.clara.net/display/DAT/Project+and+Workflow) and create a branch with its Jira ID. If you would like to resolve an issue or implement new monitors you must follow our [best practices](https://confluence.fr.clara.net/display/DAT/Templates+monitors). +After any change you should run `./scripts/auto_update.sh ./` command to make sure all is up to date else the CI pipeline will fail on the branch. + ### Important notes ### * This repository represents a terraform feature and each first level directory could be imported as a terraform module, you must choose the one(s) you need. @@ -34,12 +36,11 @@ provider "datadog" { Both of the `datadog_api_key` and `datadog_app_key` are unique to the client. -### Module Declaration example ### +### Module declaration example ### - A quick example of using a set of monitors for a given terraform module: +A quick example of using a set of monitors for a given terraform module: ``` - variable "oncall_24x7" { default = "@pagerduty-Public_Cloud_FR_-_Yoda_-_Unibail_HNO" } @@ -68,8 +69,8 @@ module "datadog-monitors-my-monitors-set" { } ``` -`my/monitors/set` represents the path to a monitors set sub directory listed above. The `//` is very important, it's a terraform specific syntax used to separate git url and folder path. +`my/monitors/set` represents the path to a monitors set sub directory listed below. ### Monitors summary ### From 2bf5b8fef48e8c70480c099cc614d3393637d04d Mon Sep 17 00:00:00 2001 From: Quentin Manfroi Date: Thu, 18 Apr 2019 12:57:15 +0200 Subject: [PATCH 2/3] MON-437 add missing scope to readme script --- scripts/02_update_readme.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/02_update_readme.sh b/scripts/02_update_readme.sh index 7918e9f..8269327 100755 --- a/scripts/02_update_readme.sh +++ b/scripts/02_update_readme.sh @@ -10,7 +10,7 @@ sed -i '/### Monitors summary ###/q' README.md # add a newline after listing section echo >> README.md # loop over all ready monitors sets on the repo -for path in $(find -mindepth 1 \( -path './incubator' -o -path './scripts' -o -path './testing' -o -path '*/\.*' \) -prune -o -type d -print | sort -fdbi); do +for path in $(find "$(get_scope $1)" -mindepth 1 \( -path './incubator' -o -path './scripts' -o -path './testing' -o -path '*/\.*' \) -prune -o -type d -print | sort -fdbi); do # split path in directories directories=($(list_dirs $path)) # loop over directories in path From 32f9db8ca49d08477bfa6b1f87b8b5bcefcf2b38 Mon Sep 17 00:00:00 2001 From: Quentin Manfroi Date: Thu, 18 Apr 2019 18:54:53 +0200 Subject: [PATCH 3/3] MON-437 change runner to product teams --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1988083..087b35a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,5 +15,6 @@ test_auto_update: - git status - git diff --exit-code tags: - - docker-runner + - product-teams - kubernetes + - gke